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/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1416,6 +1416,7 @@ struct RAWParams {
        int greenthresh;
        int dcb_iterations;
        int lmmse_iterations;
+        bool dualDemosaicAutoContrast;
        double dualDemosaicContrast;
        PSMotionCorrectionMethod pixelShiftMotionCorrectionMethod;
        double pixelShiftEperIso;
@@ -1463,6 +1464,7 @@ struct RAWParams {
        };

        Glib::ustring method;
+        bool dualDemosaicAutoContrast;
        double dualDemosaicContrast;
        int ccSteps;
        double blackred;