merge with dev

2018-11-20 17:50:33 +01:00
parent 333ac99532 aa286a32f9
commit 721972ee72
81 changed files with 2596 additions and 1853 deletions
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -1378,8 +1378,8 @@ private:

        Imagefloat* readyImg = nullptr;
        cmsHPROFILE jprof = nullptr;
-        bool customGamma = false;
-        bool useLCMS = false;
+        constexpr bool customGamma = false;
+        constexpr bool useLCMS = false;
        bool bwonly = params.blackwhite.enabled && !params.colorToning.enabled && !autili && !butili ;

        ///////////// Custom output gamma has been removed, the user now has to create