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/mydiagonalcurve.cc
+++ b/rtgui/mydiagonalcurve.cc
@@ -574,8 +574,8 @@ bool MyDiagonalCurve::handleEvents (GdkEvent* event)
                        ity = curve.y.begin();

                        for (int i = 0; i < closest_point; i++) {
-                            itx++;
-                            ity++;
+                            ++itx;
+                            ++ity;
                        }

                        curve.x.insert (itx, 0);
@@ -1099,8 +1099,8 @@ bool MyDiagonalCurve::pipetteButton1Pressed(EditDataProvider *provider, int modi
            ity = curve.y.begin();

            for (int i = 0; i < closest_point; i++) {
-                itx++;
-                ity++;
+                ++itx;
+                ++ity;
            }

            lit_point = closest_point;