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

Fix segfault when using Colour Toning/Lab blending on very dark images

Browse Source
This commit is contained in:
Ingo Weyrich
2020-03-29 17:42:48 +02:00
parent 30eb7bfd00
commit bae1897b44
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rtengine/improcfun.cc
View File

@@ -1989,8 +1989,8 @@ void ImProcFunctions::moyeqt (Imagefloat* working, float &moyS, float &eqty)
{
BENCHFUN
int tHh = working->getHeight();
int tWw = working->getWidth();
const int height = working->getHeight();
const int width = working->getWidth();
double moy = 0.0;
double sqrs = 0.0;
@@ -1998,17 +1998,17 @@ void ImProcFunctions::moyeqt (Imagefloat* working, float &moyS, float &eqty)
#pragma omp parallel for reduction(+:moy,sqrs) schedule(dynamic,16)
#endif
for (int i = 0; i < tHh; i++) {
for (int j = 0; j < tWw; j++) {
double s = Color::rgb2s (CLIP (working->r (i, j)), CLIP (working->g (i, j)), CLIP (working->b (i, j)));
for (int i = 0; i < height; i++) {
for (int j = 0; j < width; j++) {
const double s = Color::rgb2s(CLIP(working->r (i, j)), CLIP(working->g (i, j)), CLIP(working->b (i, j)));
moy += s;
sqrs += SQR(s);
}
}
moy /= (tHh * tWw);
sqrs /= (tHh * tWw);
eqty = sqrt (sqrs - SQR (moy));
moy /= (height * width);
sqrs /= (height * width);
eqty = std::sqrt(std::max(sqrs - SQR(moy), 0.0));
moyS = moy;
}