diff --git a/rtengine/hlmultipliers.cc b/rtengine/hlmultipliers.cc index 6347c0d90..99b329798 100644 --- a/rtengine/hlmultipliers.cc +++ b/rtengine/hlmultipliers.cc @@ -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]); } } } diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc index 3ab67cd81..aaaaaa7ba 100644 --- a/rtengine/rawimagesource.cc +++ b/rtengine/rawimagesource.cc @@ -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); } diff --git a/tools/osx/make-app-bundle b/tools/osx/make-app-bundle old mode 100644 new mode 100755