Merge with branch 'dev/newlocallab'...

2019-01-25 12:58:28 +01:00
parent fc6e4ceaf1 1101484ecb
commit 8c90b560d7
50 changed files with 1667 additions and 1874 deletions
--- a/rtengine/improccoordinator.h
+++ b/rtengine/improccoordinator.h
@@ -240,11 +240,18 @@ protected:
    LocHHmaskCurve lochhmasCurve;
    LocCCmaskexpCurve locccmasexpCurve;
    LocLLmaskexpCurve locllmasexpCurve;
+    LocHHmaskexpCurve lochhmasexpCurve;
    ProcParams nextParams2;
    bool locallutili;
    bool localcutili;
    bool localskutili;
    bool localexutili;
+    bool llmasutili;
+    bool lhmasutili;
+    bool lcmasutili;
+    bool lcmasexputili;
+    bool lhmasexputili;
+    bool llmasexputili;
    bool LHutili;
    bool HHutili;
    LUTf huerefs;
@@ -256,6 +263,7 @@ protected:
    bool lastspotdup;
    int locallColorMask;
    int locallExpMask;
+    float avg;
    
 public: