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

GUI change of the HLRecovery tool inside Exposure, see issue 2137

Browse Source
This commit is contained in:
natureh.510
2013-12-19 17:12:02 +01:00
parent bde1aff3c7
commit cc3bbe4e78
11 changed files with 134 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtengine/rtthumbnail.cc
View File

@@ -597,7 +597,7 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, int rhei
double logDefGain = log(defGain) / log(2.0);
int rmi, gmi, bmi;
// Since HL recovery is not rendered in thumbs
// if (!isRaw || !params.hlrecovery.enabled) {
// if (!isRaw || !params.toneCurve.hrenabled) {
logDefGain = 0.0;
rmi = 1024.0 * rm * defGain / mul_lum;
gmi = 1024.0 * gm * defGain / mul_lum;
@@ -661,12 +661,12 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, int rhei
/*
// apply highlight recovery, if needed -- CURRENTLY BROKEN DUE TO INCOMPATIBLE DATA TYPES; DO WE CARE???
if (isRaw && params.hlrecovery.enabled) {
if (isRaw && params.toneCurve.hrenabled) {
int maxval = 65535 / defGain;
if (params.hlrecovery.method=="Luminance" || params.hlrecovery.method=="Color")
if (params.toneCurve.method=="Luminance" || params.toneCurve.method=="Color")
for (int i=0; i<rheight; i++)
RawImageSource::HLRecovery_Luminance (baseImg->r[i], baseImg->g[i], baseImg->b[i], baseImg->r[i], baseImg->g[i], baseImg->b[i], rwidth, maxval);
else if (params.hlrecovery.method=="CIELab blending") {
else if (params.toneCurve.method=="CIELab blending") {
double icamToD50[3][3];
RawImageSource::inverse33 (cam2xyz, icamToD50);
for (int i=0; i<rheight; i++)