Restoring color propagation highlight reconstruction. Just had to remove a few CLIP() calls.

This commit is contained in:
Emil Martinec
2011-04-29 20:35:33 -05:00
parent 68c1a27f4d
commit 3955d21f5b
3 changed files with 7 additions and 7 deletions

View File

@@ -235,13 +235,13 @@ void RawImageSource::HLRecovery_ColorPropagation (float* red, float* green, floa
double mulr = mr1*mc1 * hrmap[0][blr][blc] + mr1*(1.0-mc1) * hrmap[0][blr][blc+1] + (1.0-mr1)*mc1 * hrmap[0][blr+1][blc] + (1.0-mr1)*(1.0-mc1) * hrmap[0][blr+1][blc+1];
double mulg = mr1*mc1 * hrmap[1][blr][blc] + mr1*(1.0-mc1) * hrmap[1][blr][blc+1] + (1.0-mr1)*mc1 * hrmap[1][blr+1][blc] + (1.0-mr1)*(1.0-mc1) * hrmap[1][blr+1][blc+1];
double mulb = mr1*mc1 * hrmap[2][blr][blc] + mr1*(1.0-mc1) * hrmap[2][blr][blc+1] + (1.0-mr1)*mc1 * hrmap[2][blr+1][blc] + (1.0-mr1)*(1.0-mc1) * hrmap[2][blr+1][blc+1];
red[jx] = CLIP(red[jx] * mulr);
green[jx] = CLIP(green[jx] * mulg);
blue[jx] = CLIP(blue[jx] * mulb);
red[jx] = (red[jx] * mulr);
green[jx] = (green[jx] * mulg);
blue[jx] = (blue[jx] * mulb);
} else {
red[jx] = CLIP(red[jx]);
green[jx] = CLIP(green[jx]);
blue[jx] = CLIP(blue[jx]);
red[jx] = (red[jx]);
green[jx] = (green[jx]);
blue[jx] = (blue[jx]);
}
}
}

View File

@@ -1846,7 +1846,7 @@ void RawImageSource::hlRecovery (std::string method, float* red, float* green, f
if (method=="Luminance")
HLRecovery_Luminance (red, green, blue, red, green, blue, width, 65535.0);
else if (method=="CIELab blending")
HLRecovery_CIELab (red, green, blue, red, green, blue, width, 65535.0/**initialGain*/, xyz_cam, cam_xyz);
HLRecovery_CIELab (red, green, blue, red, green, blue, width, 65535.0, xyz_cam, cam_xyz);
else if (method=="Color")
HLRecovery_ColorPropagation (red, green, blue, i, sx1, width, skip);
}

0
tools/osx/make-app-bundle Normal file → Executable file
View File