merge with dev

2017-12-21 08:42:43 +01:00
parent a017505cec 62585bc434
commit 46181f1008
43 changed files with 878 additions and 75 deletions
--- a/rtengine/improcfun.cc
+++ b/rtengine/improcfun.cc
@@ -3438,6 +3438,9 @@ void ImProcFunctions::rgbProc(Imagefloat* working, LabImage* lab, PipetteBuffer
        int tW;
        int tH;

+        // zero out the buffers
+        memset(buffer, 0, 3 * sizeof (float) * TS * TS + 20 * 64 + 63);
+
        // Allocating buffer for the PipetteBuffer
        float *editIFloatTmpR = nullptr, *editIFloatTmpG = nullptr, *editIFloatTmpB = nullptr, *editWhateverTmp = nullptr;

@@ -4976,6 +4979,11 @@ void ImProcFunctions::rgbProc(Imagefloat* working, LabImage* lab, PipetteBuffer
    if (vCurveEnabled) {
        delete vCurve;
    }
+
+    if (params->localContrast.enabled) {
+        // Alberto's local contrast
+        localContrast(lab);
+    }
 }

 /**