merge with dev

2019-07-18 13:41:26 +02:00
parent 1add88a9ae 4a6956d91e
commit cbeb828609
52 changed files with 1853 additions and 463 deletions
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -211,6 +211,11 @@ private:
        imgsrc->setCurrentFrame(params.raw.bayersensor.imageNum);
        imgsrc->preprocess(params.raw, params.lensProf, params.coarse, params.dirpyrDenoise.enabled);

+        // After preprocess, run film negative processing if enabled
+        if (imgsrc->getSensorType() == ST_BAYER && params.filmNegative.enabled) {
+            imgsrc->filmNegativeProcess (params.filmNegative);
+        }
+
        if (pl) {
            pl->setProgress(0.20);
        }