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

Suppress compilation warning in improcfun.cc due to sumQ

Browse Source
This commit is contained in:
Desmis
2017-09-29 08:31:06 +02:00
parent 0a3a4a1e74
commit dbe1fb3fa6
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rtengine/improcfun.cc
View File

@@ -1793,7 +1793,7 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int begh, int
} }
float sum = 0.f; float sum = 0.f;
float sumQ = 0.f; // float sumQ = 0.f;
#ifdef _OPENMP #ifdef _OPENMP
const int numThreads = min (max (width * height / 65536, 1), omp_get_max_threads()); const int numThreads = min (max (width * height / 65536, 1), omp_get_max_threads());
@@ -1813,8 +1813,10 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int begh, int
hist16Qthr.clear(); hist16Qthr.clear();
} }
#pragma omp for reduction(+:sum,sumQ) // #pragma omp for reduction(+:sum,sumQ)
#pragma omp for reduction(+:sum)
for (int i = 0; i < height; i++) for (int i = 0; i < height; i++)
for (int j = 0; j < width; j++) { //rough correspondence between L and J for (int j = 0; j < width; j++) { //rough correspondence between L and J
float currL = lab->L[i][j] / 327.68f; float currL = lab->L[i][j] / 327.68f;
@@ -1859,6 +1861,7 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int begh, int
} }
//estimation of wh only with La //estimation of wh only with La
/*
float whestim = 500.f; float whestim = 500.f;
if (la < 200.f) { if (la < 200.f) {
@@ -1868,7 +1871,7 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int begh, int
} else { } else {
whestim = 500.f; whestim = 500.f;
} }
*/
if (needQ) { if (needQ) {
hist16Qthr[CLIP ((int) (32768.f * sqrt ((koef * (lab->L[i][j])) / 32768.f)))]++; //for brightness Q : approximation for Q=wh*sqrt(J/100) J not equal L hist16Qthr[CLIP ((int) (32768.f * sqrt ((koef * (lab->L[i][j])) / 32768.f)))]++; //for brightness Q : approximation for Q=wh*sqrt(J/100) J not equal L
//perhaps needs to introduce whestim ?? //perhaps needs to introduce whestim ??
@@ -1876,7 +1879,7 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int begh, int
} }
sum += koef * lab->L[i][j]; //evaluate mean J to calculate Yb sum += koef * lab->L[i][j]; //evaluate mean J to calculate Yb
sumQ += whestim * sqrt ((koef * (lab->L[i][j])) / 32768.f); // sumQ += whestim * sqrt ((koef * (lab->L[i][j])) / 32768.f);
//can be used in case of... //can be used in case of...
} }