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

Fixed a bug I introduced with last commit and changed argument order of Ciecam02::curveJfloat

Browse Source
This commit is contained in:
heckflosse
2016-05-14 12:04:02 +02:00
parent 74447dff99
commit 9da7de4080
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rtengine/ciecam02.cc
View File

@@ -180,7 +180,7 @@ void Ciecam02::curveJ (double br, double contr, int db, LUTf & outCurve, LUTu &
}
}
void Ciecam02::curveJfloat (float br, float contr, LUTf & outCurve, const LUTu & histogram )
void Ciecam02::curveJfloat (float br, float contr, const LUTu & histogram, LUTf & outCurve)
{
// check if brightness curve is needed
@@ -233,10 +233,15 @@ void Ciecam02::curveJfloat (float br, float contr, LUTf & outCurve, const LUTu &
if (contr > 0.00001f || contr < -0.00001f) {
// compute mean luminance of the image with the curve applied
float sum, avg;
float sum = 0.f;
float avg = 0.f;
histogram.getSumAndAverage(sum, avg);
for (int i = 0; i < 32768; i++) {
avg += outCurve[i] * histogram[i];//approximation for average : usage of L (lab) instead of J
sum += histogram[i];
}
avg /= sum;
std::vector<double> contrastcurvePoints(9);
contrastcurvePoints[0] = double(DCT_NURBS);