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/improccoordinator.cc
View File

@@ -473,7 +473,9 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall)
}
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;
@@ -485,6 +487,7 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall)
params.toneCurve.brightness = 0;
params.toneCurve.contrast = 0;
params.toneCurve.black = 0;
params.toneCurve.fromHistMatching = true;
if (aeListener) {
aeListener->autoMatchedToneCurveChanged(params.toneCurve.curveMode, params.toneCurve.curve);