From 3dfdabda6e84fc328136f8cab7e01b52eceb821c Mon Sep 17 00:00:00 2001 From: torger Date: Sun, 3 Nov 2013 12:10:18 +0100 Subject: [PATCH] fixed messing up vignetting correction bug in previous patch for issue 1615 --- rtengine/iptransform.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rtengine/iptransform.cc b/rtengine/iptransform.cc index 6a3f0144f..4726c863b 100644 --- a/rtengine/iptransform.cc +++ b/rtengine/iptransform.cc @@ -388,16 +388,16 @@ void ImProcFunctions::transformLuminanceOnly (Imagefloat* original, Imagefloat* for (int x=0; xwidth; x++) { double vig_x_d = (double) (x + cx) - vig_w2 ; double r = sqrt(vig_x_d*vig_x_d + vig_y_d*vig_y_d); - double mul = 1.0; + double factor = 1.0; if (applyVignetting) { - mul /= std::max(v + mul * tanh (b*(maxRadius-r) / maxRadius), 0.001); + factor /= std::max(v + mul * tanh (b*(maxRadius-r) / maxRadius), 0.001); } if (applyGradient) { - mul *= calcGradientFactor(gp, x, y); + factor *= calcGradientFactor(gp, x, y); } - transformed->r(y,x) = original->r(y,x) * mul; - transformed->g(y,x) = original->g(y,x) * mul; - transformed->b(y,x) = original->b(y,x) * mul; + transformed->r(y,x) = original->r(y,x) * factor; + transformed->g(y,x) = original->g(y,x) * factor; + transformed->b(y,x) = original->b(y,x) * factor; } } }