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

merge with dev

Browse Source
This commit is contained in:
Desmis
2018-01-17 10:45:46 +01:00
parent 6b524720c0 f644d41ff2
commit c91d0ace56
5 changed files with 3 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rtengine/improccoordinator.cc
View File

@@ -346,11 +346,7 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall)
imgsrc->preprocess(rp, params.lensProf, params.coarse);
imgsrc->getRAWHistogram(histRedRaw, histGreenRaw, histBlueRaw);
if (highDetailNeeded) {
highDetailPreprocessComputed = true;
} else {
highDetailPreprocessComputed = false;
}
highDetailPreprocessComputed = highDetailNeeded;
}
/*
@@ -416,21 +412,6 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall)
}
}
// Updating toneCurve.hrenabled if necessary
// It has to be done there, because the next 'if' statement will use the value computed here
if (todo & M_AUTOEXP) {
if (params.toneCurve.autoexp) {// this enabled HLRecovery
if (ToneCurveParams::HLReconstructionNecessary(histRedRaw, histGreenRaw, histBlueRaw) && !params.toneCurve.hrenabled) {
// switching params.toneCurve.hrenabled to true -> shouting in listener's ears!
params.toneCurve.hrenabled = true;
// forcing INIT to be done, to reconstruct HL again
todo |= M_INIT;
}
}
}
if (todo & (M_INIT | M_LINDENOISE | M_HDR)) {
MyMutex::MyLock initLock(minit); // Also used in crop window