merge with dev

2018-10-26 09:00:29 +02:00
parent e7448bd084 fef2f73aa7
commit 21292f6db5
34 changed files with 503 additions and 164 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -857,6 +857,7 @@ public:
        bool dcbIterations;
        bool dcbEnhance;
        bool lmmseIterations;
+        bool dualDemosaicAutoContrast;
        bool dualDemosaicContrast;
        bool pixelShiftMotionCorrectionMethod;
        bool pixelShiftEperIso;
@@ -887,6 +888,7 @@ public:

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