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

Fixe race in tmo_fattal, #4255

Browse Source
This commit is contained in:
heckflosse 2018-01-08 15:21:56 +01:00
parent 7f89c362d0
commit 6c6786929c
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
rtengine/tmo_fattal02.cc
View File

@ -1125,18 +1125,33 @@ void ImProcFunctions::ToneMapFattal02 (Imagefloat *rgb)
int max_x = 0, max_y = 0; int max_x = 0, max_y = 0;
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel for if (multiThread) #pragma omp parallel if (multiThread)
#endif
{
float max_YThr = 0.f;
int max_xThr = 0, max_yThr = 0;
#ifdef _OPENMP
#pragma omp for
#endif #endif
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_Y) { if (Yr(x, y) > max_YThr) {
max_Y = Yr(x, y); max_YThr = Yr(x, y);
max_x = x; max_xThr = x;
max_y = y; max_yThr = y;
} }
} }
} }
#ifdef _OPENMP
#pragma omp critical
#endif
if (max_YThr > max_Y) {
max_Y = max_YThr;
max_x = max_xThr;
max_y = max_yThr;
}
}
// median filter on the deep shadows, to avoid boosting noise // median filter on the deep shadows, to avoid boosting noise
// because w2 >= w and h2 >= h, we can use the L buffer as temporary buffer for Median_Denoise() // because w2 >= w and h2 >= h, we can use the L buffer as temporary buffer for Median_Denoise()