Merged master into gtk3, fixed three conflicts.

2016-06-09 22:36:59 +02:00
parent 7040b6e5b1
commit c857bba95e
50 changed files with 6109 additions and 6009 deletions
--- a/rtengine/ipvibrance.cc
+++ b/rtengine/ipvibrance.cc
@@ -59,9 +59,7 @@ void fillCurveArrayVib(DiagonalCurve* diagCurve, LUTf &outCurve)
            outCurve[i] = 65535.f * diagCurve->getVal( double(i) / 65535.0 );
        }
    } else {
-        for (int i = 0; i <= 0xffff; i++) {
-            outCurve[i] = float(i);
-        }
+        outCurve.makeIdentity();
    }
 }