Merge branch 'master' into gtk3

2016-07-09 23:49:31 +02:00
parent 93360770e1 3b734e4a7a
commit 040962c1b7
49 changed files with 418 additions and 419 deletions
--- a/rtgui/imagearea.cc
+++ b/rtgui/imagearea.cc
@@ -215,7 +215,7 @@ bool ImageArea::on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr)
        cr->fill ();
    }

-    for (std::list<CropWindow*>::reverse_iterator i = cropWins.rbegin(); i != cropWins.rend(); i++) {
+    for (std::list<CropWindow*>::reverse_iterator i = cropWins.rbegin(); i != cropWins.rend(); ++i) {
        (*i)->expose (cr);
    }