Raw white point remodeling + small cleanups; see issue #680

This commit is contained in:
Oliver Duis
2011-05-12 03:01:48 +02:00
parent 4305e0cb2c
commit 4ab0f9f6e8
4 changed files with 63 additions and 64 deletions

View File

@@ -1088,9 +1088,7 @@ void RawImageSource::preprocess (const RAWParams &raw)
CA_correct_RT(raw.cared, raw.cablue);
}
if ( raw.expos !=1 ) { // exposure
exp_bef(raw.expos, raw.preser);
}
if ( raw.expos !=1 ) processRawWhitepoint(raw.expos, raw.preser);
t2.set();
if( settings->verbose )
@@ -1295,9 +1293,7 @@ void RawImageSource::scaleColors(int winx,int winy,int winw,int winh)
if( ri->isBayer() ){
for (int row = winy; row < winy+winh; row ++){
for (int col = winx; col < winx+winw; col++) {
int val = rawData[row][col];
if (!val)
continue;
float val = rawData[row][col];
int c = FC(row, col);
val -= cblack[c];
val *= scale_mul[c];
@@ -1307,7 +1303,7 @@ void RawImageSource::scaleColors(int winx,int winy,int winw,int winh)
}else{
for (int row = winy; row < winy+winh; row ++){
for (int col = winx; col < winx+winw; col++) {
int val = rawData[row][3*col+0];
float val = rawData[row][3*col+0];
if (val){
val -= cblack[0];
val *= scale_mul[0];