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/rtthumbnail.cc
+++ b/rtengine/rtthumbnail.cc
@@ -289,7 +289,8 @@ Image8 *load_inspector_mode(const Glib::ustring &fname, RawMetaDataLocation &rml
    neutral.icm.workingProfile = "RT_sRGB";

    src.preprocess(neutral.raw, neutral.lensProf, neutral.coarse, false);
-    src.demosaic(neutral.raw);
+    double thresholdDummy = 0.f;
+    src.demosaic(neutral.raw, false, thresholdDummy);

    PreviewProps pp(0, 0, w, h, 1);