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

Improve code and contrast slider - add show modifications to exposure and Color

Browse Source
This commit is contained in:
Desmis
2019-01-06 14:14:04 +01:00
parent 9b845a628e
commit 476846f2ab
17 changed files with 919 additions and 1902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rtengine/improccoordinator.cc
View File

@@ -107,6 +107,7 @@ ImProcCoordinator::ImProcCoordinator()
shtonecurveloc(65536, 0),
tonecurveloc(65536, 0),
lightCurveloc(32770, 0),
lhist16loc(32770, 0),
locallutili(false), localcutili(false), localskutili(false), localexutili(false), LHutili(false), HHutili(false),
huerefs(500, -100000.f),
huerefblurs(500, -100000.f),
@@ -693,7 +694,7 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
}
readyphase++;
lhist16(32768);
// lhist16(32768);
if (todo & (M_LUMACURVE | M_CROP)) {
LUTu lhist16(32768);
@@ -792,19 +793,23 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
double hlcomprthresh = params.locallab.spots.at(sp).hlcomprthresh;
double shcompr = params.locallab.spots.at(sp).shcompr;
double br = params.locallab.spots.at(sp).lightness;
CurveFactory::complexCurvelocal(ecomp, black / 65535., hlcompr, hlcomprthresh, shcompr, br,
hltonecurveloc, shtonecurveloc, tonecurveloc, lightCurveloc,
sca);
double cont = params.locallab.spots.at(sp).contrast;
lhist16loc.clear();
// Reference parameters computation
double huere, chromare, lumare, huerefblu, sobelre;
if (params.locallab.spots.at(sp).spotMethod == "exc") {
ipf.calc_ref(sp, reserv, reserv, 0, 0, pW, pH, scale, huerefblu, huere, chromare, lumare, sobelre);
ipf.calc_ref(sp, reserv, reserv, 0, 0, pW, pH, scale, huerefblu, huere, chromare, lumare, sobelre, lhist16loc);
} else {
ipf.calc_ref(sp, nprevl, nprevl, 0, 0, pW, pH, scale, huerefblu, huere, chromare, lumare, sobelre);
ipf.calc_ref(sp, nprevl, nprevl, 0, 0, pW, pH, scale, huerefblu, huere, chromare, lumare, sobelre, lhist16loc);
}
CurveFactory::complexCurvelocal(ecomp, black / 65535., hlcompr, hlcomprthresh, shcompr, br, cont, lhist16loc,
hltonecurveloc, shtonecurveloc, tonecurveloc, lightCurveloc,
sca);
huerblu = huerefblurs[sp] = huerefblu;
huer = huerefs[sp] = huere;
chromar = chromarefs[sp] = chromare;