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

fixed segfault (out of range LUT access) in shadows/highlights

Browse Source 
Fixes #4922
This commit is contained in:
Alberto Griggio 2018-11-02 12:01:24 +01:00
parent 4186c2b139
commit e611efd6b4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rtengine/ipshadowshighlights.cc
View File

@ -160,7 +160,7 @@ void ImProcFunctions::shadowsHighlights(LabImage *lab)
float orig = 1.f - blend; float orig = 1.f - blend;
if (l >= 0.f && l < 32768.f) { if (l >= 0.f && l < 32768.f) {
if (lab_mode) { if (lab_mode) {
lab->L[y][x] = f[l] * blend + l * orig; lab->L[y][x] = intp(blend, f[l], l);
if (!hl && l > 1.f) { if (!hl && l > 1.f) {
// when pushing shadows, scale also the chromaticity // when pushing shadows, scale also the chromaticity
float s = max(lab->L[y][x] / l * 0.5f, 1.f) * blend; float s = max(lab->L[y][x] / l * 0.5f, 1.f) * blend;
@ -173,7 +173,10 @@ void ImProcFunctions::shadowsHighlights(LabImage *lab)
float rgb[3]; float rgb[3];
lab2rgb(l, lab->a[y][x], lab->b[y][x], rgb[0], rgb[1], rgb[2]); lab2rgb(l, lab->a[y][x], lab->b[y][x], rgb[0], rgb[1], rgb[2]);
for (int i = 0; i < 3; ++i) { for (int i = 0; i < 3; ++i) {
rgb[i] = f[rgb[i]] * blend + rgb[i] * orig; float c = rgb[i];
if (!OOG(c)) {
rgb[i] = intp(blend, f[c], c);
}
} }
rgb2lab(rgb[0], rgb[1], rgb[2], lab->L[y][x], lab->a[y][x], lab->b[y][x]); rgb2lab(rgb[0], rgb[1], rgb[2], lab->L[y][x], lab->a[y][x], lab->b[y][x]);
} }