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/thresholdselector.cc
+++ b/rtgui/thresholdselector.cc
@@ -310,16 +310,16 @@ bool ThresholdSelector::on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr)
        if (pts.size() >= 4) {
            std::vector<double>::iterator i = pts.begin();
            double x = *i;
-            i++;
+            ++i;
            double y = *i;
-            i++;
+            ++i;
            cr->move_to (hb + hwslider + iw * x + 0.5, (yEnd - yStart)*y + yStart);

            for (; i < pts.end(); ) {
                x = *i;
-                i++;
+                ++i;
                y = *i;
-                i++;
+                ++i;
                cr->line_to (hb + hwslider + iw * x + 0.5, (yEnd - yStart)*y + yStart);
            }
        } else {