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

Fixing flat field bug.

Browse Source
This commit is contained in:
Emil Martinec 2011-03-04 18:37:08 -06:00
parent de28db60c8
commit 00952692b9
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rtengine/rawimagesource.cc
View File

@ -1061,6 +1061,7 @@ void RawImageSource::demosaic(const RAWParams &raw)
eahd_demosaic (); eahd_demosaic ();
else if (raw.dmethod == RAWParams::methodstring[RAWParams::fast] ) else if (raw.dmethod == RAWParams::methodstring[RAWParams::fast] )
fast_demo (0,0,W,H); fast_demo (0,0,W,H);
//nodemosaic();//for testing
else else
nodemosaic(); nodemosaic();
t2.set(); t2.set();
@ -1217,7 +1218,7 @@ void RawImageSource::copyOriginalPixels(const RAWParams &raw, RawImage *src, Raw
} }
for (int col=W-boxW; col<W; col+=2) { for (int col=W-boxW; col<W; col+=2) {
temp[row*W+col] = (temp[row*W+col-2]*len - riFlatFile->data[row][col-boxW-2])/(len-1); temp[row*W+col] = (temp[row*W+col-2]*len - riFlatFile->data[row][col-boxW-2])/(len-1);
if ((W&1)==0) if (col+1<W)
temp[row*W+col+1] = (temp[row*W+col-1]*len - riFlatFile->data[row][col-boxW-1])/(len-1); temp[row*W+col+1] = (temp[row*W+col-1]*len - riFlatFile->data[row][col-boxW-1])/(len-1);
len --; len --;
} }
@ -1242,7 +1243,7 @@ void RawImageSource::copyOriginalPixels(const RAWParams &raw, RawImage *src, Raw
} }
for (int row=H-boxH; row<H; row+=2) { for (int row=H-boxH; row<H; row+=2) {
cfablur[row*W+col] = (cfablur[(row-2)*W+col]*len - temp[(row-boxH-2)*W+col])/(len-1); cfablur[row*W+col] = (cfablur[(row-2)*W+col]*len - temp[(row-boxH-2)*W+col])/(len-1);
if ((H&1)==0) if (row+1<H)
cfablur[(row+1)*W+col] = (cfablur[(row-1)*W+col]*len - temp[(row-boxH-1)*W+col])/(len-1); cfablur[(row+1)*W+col] = (cfablur[(row-1)*W+col]*len - temp[(row-boxH-1)*W+col])/(len-1);
len --; len --;
} }
@ -2860,9 +2861,12 @@ void RawImageSource::nodemosaic()
blue[i] = new unsigned short[W]; blue[i] = new unsigned short[W];
for (int j=0; j<W; j++){ for (int j=0; j<W; j++){
switch( FC(i,j)){ switch( FC(i,j)){
case 0: red[i][j] = rawData[i][j]; break; case 0: red[i][j] = rawData[i][j]; green[i][j]=blue[i][j]=0; break;
case 1: green[i][j] = rawData[i][j]; break; case 1: green[i][j] = rawData[i][j]; red[i][j]=blue[i][j]=0; break;
case 2: blue[i][j] = rawData[i][j]; break; case 2: blue[i][j] = rawData[i][j]; red[i][j]=green[i][j]=0; break;
//red[i][j] = rawData[i][j];
//green[i][j] = rawData[i][j];
//blue[i][j] = rawData[i][j]; b
} }
} }
} }