Merge branch 'dev' into testoutputprofile

2018-06-25 01:07:02 +02:00
parent 81a0795d1a ae9ea3d3e0
commit 88e645a329
59 changed files with 580 additions and 372 deletions
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -203,8 +203,8 @@ private:
        if (pl) {
            pl->setProgress (0.20);
        }
-
-        imgsrc->demosaic ( params.raw);
+        double contrastThresholdDummy;
+        imgsrc->demosaic (params.raw, false, contrastThresholdDummy);

        if (pl) {
            pl->setProgress (0.30);