liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into testoutputprofile

Browse Source
This commit is contained in:
Hombre
2018-07-22 03:25:49 +02:00
parent bbde907d72 3bfd903dc7
commit 3a6556404a
2033 changed files with 40818 additions and 190141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtengine/simpleprocess.cc
View File

@@ -749,7 +749,9 @@ private:
ipf.getAutoExp (aehist, aehistcompr, params.toneCurve.clip, expcomp, bright, contr, black, hlcompr, hlcomprthresh);
}
if (params.toneCurve.histmatching) {
imgsrc->getAutoMatchedToneCurve(params.icm, params.toneCurve.curve);
if (!params.toneCurve.fromHistMatching) {
imgsrc->getAutoMatchedToneCurve(params.icm, params.toneCurve.curve);
}
if (params.toneCurve.autoexp) {
params.toneCurve.expcomp = 0.0;
@@ -761,7 +763,6 @@ private:
params.toneCurve.brightness = 0;
params.toneCurve.contrast = 0;
params.toneCurve.black = 0;
}
// at this stage, we can flush the raw data to free up quite an important amount of memory