Merge branch 'master' into softproofing

2016-08-27 23:52:53 +02:00
parent f11ef69cda d9d539cbb3
commit a1981dbd4d
12 changed files with 1584 additions and 1312 deletions
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -1050,7 +1050,7 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p

        LUTf CAMBrightCurveJ;
        LUTf CAMBrightCurveQ;
-        float CAMMean;
+        float CAMMean = NAN;

        if (params.sharpening.enabled) {
            float d;