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

Fixed accidently broken shadows/highlight tool

Browse Source
This commit is contained in:
heckflosse 2018-01-01 22:28:56 +01:00
parent b624248a13
commit e9782e15e2
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rtengine/improcfun.cc
View File

@ -3553,8 +3553,8 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, PipetteBuffer
float chMixBG = float (params->chmixer.blue[1]);
float chMixBB = float (params->chmixer.blue[2]);
int shHighlights = params->sh.highlights / 100.f;
int shShadows = params->sh.shadows / 100.f;
int shHighlights = params->sh.highlights;
int shShadows = params->sh.shadows;
bool blackwhite = params->blackwhite.enabled;
bool complem = params->blackwhite.enabledcc;
float bwr = float (params->blackwhite.mixerRed);
@ -3722,13 +3722,14 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, PipetteBuffer
float g = gtemp[ti * TS + tj];
float b = btemp[ti * TS + tj];
float mapval = 1.f + shmap->map[i][j];
float factor = 1.f;
if (mapval > h_th) {
factor = (1.f - shHighlights) + shHighlights * h_th / mapval;
factor = (h_th + (100.0 - shHighlights) * (mapval - h_th) / 100.0) / mapval;
} else if (mapval < s_th) {
factor = (s_th - (1.f - shShadows) * (s_th - mapval)) / mapval;
factor = (s_th - (100.0 - shShadows) * (s_th - mapval) / 100.0) / mapval;
}
rtemp[ti * TS + tj] = factor * r;