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

Change calculation references in case of exclude spot

Browse Source
This commit is contained in:
Desmis 2018-02-08 07:57:28 +01:00
parent 4136a6ee03
commit abd26953a5
3 changed files with 80 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/curves.cc
View File

@ -2583,6 +2583,7 @@ void PerceptualToneCurve::BatchApply(const size_t start, const size_t end, float
g = newg; g = newg;
b = newb; b = newb;
} }
rc[i] = r; rc[i] = r;
gc[i] = g; gc[i] = g;
bc[i] = b; bc[i] = b;
@ -2756,6 +2757,7 @@ void PerceptualToneCurve::BatchApply(const size_t start, const size_t end, float
g = newg; g = newg;
b = newb; b = newb;
} }
rc[i] = r; rc[i] = r;
gc[i] = g; gc[i] = g;
bc[i] = b; bc[i] = b;

12
rtengine/improccoordinator.cc
View File

@ -2698,7 +2698,12 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall)
double huere, chromare, lumare, huerefblu; double huere, chromare, lumare, huerefblu;
double sobelre; double sobelre;
if (params.locallab.Exclumethod == "exc") {
ipf.calc_ref(reserv, reserv, 0, 0, pW, pH, scale, huerefblu, huere, chromare, lumare, sobelre);
} else {
ipf.calc_ref(nprevl, nprevl, 0, 0, pW, pH, scale, huerefblu, huere, chromare, lumare, sobelre); ipf.calc_ref(nprevl, nprevl, 0, 0, pW, pH, scale, huerefblu, huere, chromare, lumare, sobelre);
}
huerblu = huerefblu; huerblu = huerefblu;
huer = huere; huer = huere;
chromar = chromare; chromar = chromare;
@ -4899,7 +4904,8 @@ void ImProcCoordinator::changenumberofspot(int **dataspot, int maxdata, int maxs
fich2.close() ; fich2.close() ;
} }
} }
bool ImProcCoordinator::getHighQualComputed() { bool ImProcCoordinator::getHighQualComputed()
{
// this function may only be called from detail windows // this function may only be called from detail windows
if (!highQualityComputed) { if (!highQualityComputed) {
if (options.prevdemo == PD_Sidecar) { if (options.prevdemo == PD_Sidecar) {
@ -4914,10 +4920,12 @@ bool ImProcCoordinator::getHighQualComputed() {
} }
} }
} }
return highQualityComputed; return highQualityComputed;
} }
void ImProcCoordinator::setHighQualComputed() { void ImProcCoordinator::setHighQualComputed()
{
highQualityComputed = true; highQualityComputed = true;
} }

6
rtengine/simpleprocess.cc
View File

@ -2166,8 +2166,14 @@ private:
double huere, chromare, lumare, huerefblu; double huere, chromare, lumare, huerefblu;
double sobelre; double sobelre;
if (params.locallab.Exclumethod == "exc") {
ipf.calc_ref(reservView, reservView, 0, 0, fw, fh, 1, huerefblu, huere, chromare, lumare, sobelre);
} else {
ipf.calc_ref(labView, labView, 0, 0, fw, fh, 1, huerefblu, huere, chromare, lumare, sobelre); ipf.calc_ref(labView, labView, 0, 0, fw, fh, 1, huerefblu, huere, chromare, lumare, sobelre);
}
params.locallab.huerefblur = huerefblu; params.locallab.huerefblur = huerefblu;
params.locallab.hueref = huere; params.locallab.hueref = huere;
params.locallab.chromaref = chromare; params.locallab.chromaref = chromare;