Merge branch 'master' into spot-removal-tool

rtengine/improccoordinator.h

@@ -109,16 +109,14 @@ protected:
     LUTf NoiseCCcurve;
 
     LUTu vhist16, vhist16bw;
-    LUTu lhist16, lhist16Cropped;
-    LUTu lhist16CAM, lhist16CroppedCAM;
+    LUTu lhist16CAM;
     LUTu lhist16CCAM;
     LUTu lhist16RETI;
-    LUTu histCropped;
-    LUTu lhist16Clad, lhist16CLlad, lhist16LClad, lhist16LLClad;
+    LUTu lhist16CLlad, lhist16LClad;
     LUTu histRed, histRedRaw;
     LUTu histGreen, histGreenRaw;
     LUTu histBlue, histBlueRaw;
-    LUTu histLuma, histToneCurve, histToneCurveBW, histLCurve, histCCurve, histCLurve;
+    LUTu histLuma, histToneCurve, histToneCurveBW, histLCurve, histCCurve;
     LUTu histLLCurve, histLCAM, histCCAM, histClad, bcabhist, histChroma, histLRETI;
 
     LUTf CAMBrightCurveJ, CAMBrightCurveQ;
@@ -138,6 +136,7 @@ protected:
     WavOpacityCurveW waOpacityCurveW;
     WavOpacityCurveWL waOpacityCurveWL;
     RetinextransmissionCurve dehatransmissionCurve;
+    RetinexgaintransmissionCurve dehagaintransmissionCurve;
 
     ColorAppearance customColCurve1;
     ColorAppearance customColCurve2;
@@ -200,6 +199,8 @@ protected:
     bool wavcontlutili;
     void startProcessing ();
     void process ();
+    float colourToningSatLimit;
+    float colourToningSatLimitOpacity;
 
 public:
 
@@ -326,6 +327,17 @@ public:
     {
         return imgsrc;
     }
+
+    struct DenoiseInfoStore {
+        DenoiseInfoStore () : valid(false) {}
+        float chM;
+        float max_r[9];
+        float max_b[9];
+        float ch_M[9];
+        bool valid;
+
+    } denoiseInfoStore;
+
 };
 }
 #endif