merge with dev

2018-11-01 08:37:28 +01:00
parent 21292f6db5 86b282fc68
commit b9c7fa80da
75 changed files with 1248 additions and 378 deletions
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -862,9 +862,8 @@ private:

        ipf.firstAnalysis(baseImg, params, hist16);

-        if (params.fattal.enabled) {
-            ipf.ToneMapFattal02(baseImg);
-        }
+        ipf.dehaze(baseImg);
+        ipf.ToneMapFattal02(baseImg);

        // perform transform (excepted resizing)
        if (ipf.needsTransform()) {
@@ -1249,6 +1248,8 @@ private:

        wavCLVCurve.Reset();

+        ipf.softLight(labView);
+
        //Colorappearance and tone-mapping associated

        int f_w = 1, f_h = 1;