Merge branch 'dev' into testoutputprofile

rtgui/paramsedited.h

@@ -195,6 +195,7 @@ public :
     bool enabled;
     bool matrix;
     bool amount;
+    bool contrast;
     bool uniformity;
 
 };
@@ -204,6 +205,7 @@ class SharpeningParamsEdited
 
 public:
     bool enabled;
+    bool contrast;
     bool radius;
     bool amount;
     bool threshold;
@@ -746,6 +748,7 @@ public:
         bool dcbIterations;
         bool dcbEnhance;
         bool lmmseIterations;
+        bool dualDemosaicContrast;
         bool pixelShiftMotionCorrectionMethod;
         bool pixelShiftEperIso;
         bool pixelShiftSigma;
@@ -756,10 +759,10 @@ public:
         bool pixelShiftGreen;
         bool pixelShiftBlur;
         bool pixelShiftSmooth;
-        bool pixelShiftLmmse;
         bool pixelShiftEqualBright;
         bool pixelShiftEqualBrightChannel;
         bool pixelShiftNonGreenCross;
+        bool pixelShiftDemosaicMethod;
 
         //bool allEnhance;
         bool greenEq;
@@ -775,6 +778,7 @@ public:
 
     public:
         bool method;
+        bool dualDemosaicContrast;
         bool ccSteps;
         bool exBlackRed;
         bool exBlackGreen;