merge with dev

2018-11-01 17:34:21 +01:00
parent b9c7fa80da 5e30b5ac58
commit 19d71e46d4
19 changed files with 955 additions and 92 deletions
--- a/rtengine/rtthumbnail.cc
+++ b/rtengine/rtthumbnail.cc
@@ -1389,6 +1389,7 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, eSensorT
 	ipf.chromiLuminanceCurve (nullptr, 1, labView, labView, curve1, curve2, satcurve, lhskcurve, clcurve, lumacurve, utili, autili, butili, ccutili, cclutili, clcutili, dummy, dummy);

    ipf.vibrance (labView);
+    ipf.labColorCorrectionRegions(labView);

    if ((params.colorappearance.enabled && !params.colorappearance.tonecie) || !params.colorappearance.enabled) {
        ipf.EPDToneMap (labView, 5, 6);