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

CC and CL curves need to be reapplied at 1:1 zoom, Issue 2208

Browse Source
This commit is contained in:
Ingo
2014-01-19 16:53:18 +01:00
parent 90bf4712fa
commit 3273f53475
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rtengine/improccoordinator.cc
View File

@@ -81,7 +81,9 @@ ImProcCoordinator::ImProcCoordinator ()
pW(-1), pH(-1), pW(-1), pH(-1),
plistener(NULL), imageListener(NULL), aeListener(NULL), hListener(NULL),acListener(NULL), abwListener(NULL), plistener(NULL), imageListener(NULL), aeListener(NULL), hListener(NULL),acListener(NULL), abwListener(NULL),
resultValid(false), changeSinceLast(0), updaterRunning(false), destroying(false) resultValid(false), changeSinceLast(0), updaterRunning(false), destroying(false),utili(false),autili(false),
butili(false),ccutili(false),cclutili(false),clcutili(false)
{} {}
void ImProcCoordinator::assign (ImageSource* imgsrc) { void ImProcCoordinator::assign (ImageSource* imgsrc) {
@@ -349,17 +351,23 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall) {
} }
readyphase++; readyphase++;
utili=false; // utili=false;
// autili=false;
// butili=false;
// ccutili=false;
// cclutili=false;
// clcutili=false;
if ((todo & M_LUMACURVE) || (todo & M_CROP)) {
utili = false;
CurveFactory::complexLCurve (params.labCurve.brightness, params.labCurve.contrast, params.labCurve.lcurve, lhist16, lhist16Cropped,
lumacurve, histLCurve, scale==1 ? 1 : 16, utili);
}
if (todo & M_LUMACURVE) {
autili=false; autili=false;
butili=false; butili=false;
ccutili=false; ccutili=false;
cclutili=false; cclutili=false;
clcutili=false; clcutili=false;
if ((todo & M_LUMACURVE) || (todo & M_CROP)) {
CurveFactory::complexLCurve (params.labCurve.brightness, params.labCurve.contrast, params.labCurve.lcurve, lhist16, lhist16Cropped,
lumacurve, histLCurve, scale==1 ? 1 : 16, utili);
}
if (todo & M_LUMACURVE) {
CurveFactory::curveCL(clcutili, params.labCurve.clcurve, clcurve, lhist16CLlad, histCLurve, scale==1 ? 1 : 16); CurveFactory::curveCL(clcutili, params.labCurve.clcurve, clcurve, lhist16CLlad, histCLurve, scale==1 ? 1 : 16);