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

Bugfix for autoWB, WB averaging should be done in linear gamma.

Browse Source
This commit is contained in:
Emil Martinec
2010-11-17 19:22:45 -06:00
parent cf9b082d60
commit e32fe4cc31
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtengine/stdimagesource.cc
View File

@@ -464,18 +464,22 @@ ColorTemp StdImageSource::getAutoWB () {
double avg_g = 0;
double avg_b = 0;
int n = 0;
int p = 6;
//int p = 6;
for (int i=1; i<img->height-1; i++)
for (int j=1; j<img->width-1; j++) {
if (img->r[i][j]>64000 || img->g[i][j]>64000 || img->b[i][j]>64000)
continue;
avg_r += intpow((double)img->r[i][j], p);
avg_r += SQR((double)img->r[i][j]);
avg_g += SQR((double)img->g[i][j]);
avg_b += SQR((double)img->b[i][j]);
/*avg_r += intpow((double)img->r[i][j], p);
avg_g += intpow((double)img->g[i][j], p);
avg_b += intpow((double)img->b[i][j], p);
avg_b += intpow((double)img->b[i][j], p);*/
n++;
}
return ColorTemp (avg_r/n, avg_g/n, avg_b/n);
return ColorTemp (sqrt(avg_r/n), sqrt(avg_g/n), sqrt(avg_b/n));
//return ColorTemp (pow(avg_r/n, 1.0/p), pow(avg_g/n, 1.0/p), pow(avg_b/n, 1.0/p));
}