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

Fattal: do not consider clipped values when determining the luminance scaling factor

Browse Source 
This solves the issue with "color propagation" highlight reconstruction described in #4255
This commit is contained in:
Alberto Griggio 2018-01-11 15:05:15 +01:00
parent 91e494a709
commit a748354b7b
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rtengine/tmo_fattal02.cc
View File

@ -1119,6 +1119,12 @@ void ImProcFunctions::ToneMapFattal02 (Imagefloat *rgb)
const float epsilon = 1e-4f; const float epsilon = 1e-4f;
const float luminance_noise_floor = 65.535f; const float luminance_noise_floor = 65.535f;
const float min_luminance = 1.f; const float min_luminance = 1.f;
const auto unclipped =
[=](int y, int x) -> bool
{
const float c = 65500.f;
return rgb->r(y, x) < c && rgb->g(y, x) < c && rgb->b(y, x) < c;
};
TMatrix ws = ICCStore::getInstance()->workingSpaceMatrix (params->icm.working); TMatrix ws = ICCStore::getInstance()->workingSpaceMatrix (params->icm.working);
float max_Y = 0.f; float max_Y = 0.f;
@ -1136,7 +1142,7 @@ void ImProcFunctions::ToneMapFattal02 (Imagefloat *rgb)
for (int y = 0; y < h; y++) { for (int y = 0; y < h; y++) {
for (int x = 0; x < w; x++) { for (int x = 0; x < w; x++) {
Yr (x, y) = std::max (luminance (rgb->r (y, x), rgb->g (y, x), rgb->b (y, x), ws), min_luminance); // clip really black pixels Yr (x, y) = std::max (luminance (rgb->r (y, x), rgb->g (y, x), rgb->b (y, x), ws), min_luminance); // clip really black pixels
if (Yr(x, y) > max_YThr) { if (Yr(x, y) > max_YThr && unclipped(y, x)) {
max_YThr = Yr(x, y); max_YThr = Yr(x, y);
max_xThr = x; max_xThr = x;
max_yThr = y; max_yThr = y;