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

Fixed Auto Levels Clip malfunction issue 2104

Browse Source
This commit is contained in:
jdc
2013-12-16 17:27:07 +01:00
parent 489d6bfd83
commit aa15edd1e8
33 changed files with 399 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtengine/rawimagesource.cc
View File

@@ -202,7 +202,8 @@ void RawImageSource::transformRect (PreviewProps pp, int tran, int &ssx1, int &s
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
void RawImageSource::getImage (ColorTemp ctemp, int tran, Imagefloat* image, PreviewProps pp, HRecParams hrp, ColorManagementParams cmp, RAWParams raw )
void RawImageSource::getImage (ColorTemp ctemp, int tran, Imagefloat* image, PreviewProps pp, ToneCurveParams hrp, ColorManagementParams cmp, RAWParams raw )
{
MyMutex::MyLock lock(getImageMutex);
@@ -317,7 +318,7 @@ void RawImageSource::getImage (ColorTemp ctemp, int tran, Imagefloat* image, Pre
rtot*=rm;
gtot*=gm;
btot*=bm;
if (!hrp.enabled)
if (!hrp.hrenabled)
{
rtot=CLIP(rtot);
gtot=CLIP(gtot);
@@ -341,7 +342,7 @@ void RawImageSource::getImage (ColorTemp ctemp, int tran, Imagefloat* image, Pre
rtot*=rm;
gtot*=gm;
btot*=bm;
if (!hrp.enabled)
if (!hrp.hrenabled)
{
rtot=CLIP(rtot);
gtot=CLIP(gtot);
@@ -355,7 +356,7 @@ void RawImageSource::getImage (ColorTemp ctemp, int tran, Imagefloat* image, Pre
}
//process all highlight recovery other than "Color"
if (hrp.enabled && hrp.method!="Color")
if (hrp.hrenabled && hrp.method!="Color")
hlRecovery (hrp.method, line_red, line_grn, line_blue, i, sx1, imwidth, skip, raw, hlmax);
transLine (line_red, line_grn, line_blue, ix, image, tran, imwidth, imheight, fw);
@@ -1195,10 +1196,10 @@ void RawImageSource::flushRGB() {
}
}
void RawImageSource::HLRecovery_Global(HRecParams hrp )
void RawImageSource::HLRecovery_Global(ToneCurveParams hrp )
{
//color propagation highlight recovery
if (hrp.enabled && hrp.method=="Color"){
if (hrp.hrenabled && hrp.method=="Color"){
if (settings->verbose) printf ("Applying Highlight Recovery: Color propagation...\n");
HLRecovery_inpaint (red,green,blue);
rgbSourceModified = true;