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

Fixed gradient coordinate bugs

Browse Source
This commit is contained in:
torger
2013-11-04 09:40:20 +01:00
parent 3dfdabda6e
commit 5c2a7c9c16
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtengine/iptransform.cc
View File

@@ -379,7 +379,7 @@ void ImProcFunctions::transformLuminanceOnly (Imagefloat* original, Imagefloat*
struct grad_params gp; struct grad_params gp;
if (applyGradient) { if (applyGradient) {
calcGradientParams(transformed->width, transformed->height, params->gradient, gp); calcGradientParams(oW, oH, params->gradient, gp);
} }
#pragma omp parallel for if (multiThread) #pragma omp parallel for if (multiThread)
@@ -393,7 +393,7 @@ void ImProcFunctions::transformLuminanceOnly (Imagefloat* original, Imagefloat*
factor /= 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) { if (applyGradient) {
factor *= calcGradientFactor(gp, x, y); factor *= calcGradientFactor(gp, cx+x, cy+y);
} }
transformed->r(y,x) = original->r(y,x) * factor; transformed->r(y,x) = original->r(y,x) * factor;
transformed->g(y,x) = original->g(y,x) * factor; transformed->g(y,x) = original->g(y,x) * factor;
@@ -417,7 +417,7 @@ void ImProcFunctions::transformHighQuality (Imagefloat* original, Imagefloat* tr
struct grad_params gp; struct grad_params gp;
if (needsGradient()) { if (needsGradient()) {
calcGradientParams(transformed->width, transformed->height, params->gradient, gp); calcGradientParams(oW, oH, params->gradient, gp);
} }
float** chOrig[3]; float** chOrig[3];
@@ -532,7 +532,7 @@ void ImProcFunctions::transformHighQuality (Imagefloat* original, Imagefloat* tr
if (needsVignetting()) if (needsVignetting())
vignmul /= std::max(v + mul * tanh (b*(maxRadius-s*r2) / maxRadius), 0.001); vignmul /= std::max(v + mul * tanh (b*(maxRadius-s*r2) / maxRadius), 0.001);
if (needsGradient()) { if (needsGradient()) {
vignmul *= calcGradientFactor(gp, x, y); vignmul *= calcGradientFactor(gp, cx+x, cy+y);
} }
if (yc > 0 && yc < original->height-2 && xc > 0 && xc < original->width-2) { if (yc > 0 && yc < original->height-2 && xc > 0 && xc < original->width-2) {
@@ -583,7 +583,7 @@ void ImProcFunctions::transformPreview (Imagefloat* original, Imagefloat* transf
struct grad_params gp; struct grad_params gp;
if (needsGradient()) { if (needsGradient()) {
calcGradientParams(transformed->width, transformed->height, params->gradient, gp); calcGradientParams(oW, oH, params->gradient, gp);
} }
// auxiliary variables for distortion correction // auxiliary variables for distortion correction
@@ -669,7 +669,7 @@ void ImProcFunctions::transformPreview (Imagefloat* original, Imagefloat* transf
if (needsVignetting()) if (needsVignetting())
vignmul /= std::max(v + mul * tanh (b*(maxRadius-s*r2) / maxRadius), 0.001); vignmul /= std::max(v + mul * tanh (b*(maxRadius-s*r2) / maxRadius), 0.001);
if (needsGradient()) if (needsGradient())
vignmul *= calcGradientFactor(gp, x, y); vignmul *= calcGradientFactor(gp, cx+x, cy+y);
if (yc < original->height-1 && xc < original->width-1) { if (yc < original->height-1 && xc < original->width-1) {
// all interpolation pixels inside image // all interpolation pixels inside image