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/rtthumbnail.cc
+++ b/rtengine/rtthumbnail.cc
@@ -1167,6 +1167,10 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, eSensorT

    Imagefloat* baseImg = resizeTo<Imagefloat> (rwidth, rheight, interp, thumbImg);

+    if (isRaw && params.filmNegative.enabled) {
+        processFilmNegative(params, baseImg, rwidth, rheight, rmi, gmi, bmi);
+    }
+
    if (params.coarse.rotate) {
        baseImg->rotate (params.coarse.rotate);
        rwidth = baseImg->getWidth();