merge with dev..

2018-06-14 09:06:29 +02:00
parent 03fb04cd81 e3cb9130a1
commit c1463c7edd
87 changed files with 1674 additions and 790 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -850,6 +850,7 @@ public:
        bool dcbIterations;
        bool dcbEnhance;
        bool lmmseIterations;
+        bool dualDemosaicContrast;
        bool pixelShiftMotionCorrectionMethod;
        bool pixelShiftEperIso;
        bool pixelShiftSigma;
@@ -860,10 +861,10 @@ public:
        bool pixelShiftGreen;
        bool pixelShiftBlur;
        bool pixelShiftSmooth;
-        bool pixelShiftLmmse;
        bool pixelShiftEqualBright;
        bool pixelShiftEqualBrightChannel;
        bool pixelShiftNonGreenCross;
+        bool pixelShiftDemosaicMethod;

        //bool allEnhance;
        bool greenEq;
@@ -879,6 +880,7 @@ public:

    public:
        bool method;
+        bool dualDemosaicContrast;
        bool ccSteps;
        bool exBlackRed;
        bool exBlackGreen;