merge with dev

2018-10-27 16:11:17 +02:00
parent 59339644de eee6837385
commit b50b8dea9f
211 changed files with 2968 additions and 1991 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1299,6 +1299,7 @@ struct RAWParams {
        int greenthresh;
        int dcb_iterations;
        int lmmse_iterations;
+        bool dualDemosaicAutoContrast;
        double dualDemosaicContrast;
        PSMotionCorrectionMethod pixelShiftMotionCorrectionMethod;
        double pixelShiftEperIso;
@@ -1346,6 +1347,7 @@ struct RAWParams {
        };

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