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

29
rtengine/rtthumbnail.cc
View File

@@ -162,30 +162,31 @@ Thumbnail* Thumbnail::loadFromImage (const Glib::ustring& fname, int &w, int &h,
// histogram computation // histogram computation
tpp->aeHistCompression = 3; tpp->aeHistCompression = 3;
tpp->aeHistogram = new unsigned int[65536>>tpp->aeHistCompression]; tpp->aeHistogram = new unsigned int[65536>>tpp->aeHistCompression];
memset (tpp->aeHistogram, 0, (65536>>tpp->aeHistCompression)*sizeof(int));
int ix = 0;
for (int i=0; i<img->height*img->width; i++) {
tpp->aeHistogram[CurveFactory::igamma_srgb (img->data[ix++])>>tpp->aeHistCompression]++;
tpp->aeHistogram[CurveFactory::igamma_srgb (img->data[ix++])>>tpp->aeHistCompression]++;
tpp->aeHistogram[CurveFactory::igamma_srgb (img->data[ix++])>>tpp->aeHistCompression]++;
}
// autowb computation
double avg_r = 0; double avg_r = 0;
double avg_g = 0; double avg_g = 0;
double avg_b = 0; double avg_b = 0;
int n = 0; int n = 0;
for (int i=1; i<img->height-1; i++)
for (int j=1; j<img->width-1; j++) { memset (tpp->aeHistogram, 0, (65536>>tpp->aeHistCompression)*sizeof(int));
int ofs = 3*(i*img->width + j); int ix = 0;
int rtmp=img->data[ofs], gtmp=img->data[ofs+1], btmp=img->data[ofs+2]; for (int i=0; i<img->height*img->width; i++) {
if (rtmp>64000 || gtmp>64000 || btmp>64000) int rtmp=CurveFactory::igamma_srgb (img->data[ix++]);
continue; int gtmp=CurveFactory::igamma_srgb (img->data[ix++]);
int btmp=CurveFactory::igamma_srgb (img->data[ix++]);
if (rtmp<64000 && gtmp<64000 && btmp<64000) {
// autowb computation
avg_r += rtmp; avg_r += rtmp;
avg_g += gtmp; avg_g += gtmp;
avg_b += btmp; avg_b += btmp;
n++; n++;
} }
tpp->aeHistogram[rtmp>>tpp->aeHistCompression]++;
tpp->aeHistogram[gtmp>>tpp->aeHistCompression]++;
tpp->aeHistogram[btmp>>tpp->aeHistCompression]++;
}
if (n>0) if (n>0)
ColorTemp::mul2temp (avg_r/n, avg_g/n, avg_b/n, tpp->autowbTemp, tpp->autowbGreen); ColorTemp::mul2temp (avg_r/n, avg_g/n, avg_b/n, tpp->autowbTemp, tpp->autowbGreen);

12
rtengine/stdimagesource.cc
View File

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