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

clean iptransform ipresize ipvibrance

Browse Source
This commit is contained in:
Desmis
2017-03-31 12:57:07 +02:00
parent cd93dab966
commit bdcc4ab37e
3 changed files with 310 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rtengine/ipresize.cc
View File

@@ -27,6 +27,7 @@
# include <iostream> # include <iostream>
#endif #endif
namespace rtengine namespace rtengine
{ {

10
rtengine/iptransform.cc
View File

@@ -25,6 +25,7 @@
#include "rt_math.h" #include "rt_math.h"
#include "sleef.c" #include "sleef.c"
using namespace std; using namespace std;
namespace namespace
@@ -447,7 +448,6 @@ static float calcGradientFactor(const struct grad_params& gp, int x, int y)
{ {
if (gp.angle_is_zero) { if (gp.angle_is_zero) {
int gy = gp.transpose ? x : y; int gy = gp.transpose ? x : y;
int gx = gp.transpose ? y : x;
if (gy < gp.top_edge_0) { if (gy < gp.top_edge_0) {
return gp.topmul; return gp.topmul;
@@ -805,7 +805,7 @@ void ImProcFunctions::transformHighQuality (Imagefloat* original, Imagefloat* tr
x_d = ascale * (x_d + cx - w2); // centering x coord & scale x_d = ascale * (x_d + cx - w2); // centering x coord & scale
y_d = ascale * (y_d + cy - h2); // centering y coord & scale y_d = ascale * (y_d + cy - h2); // centering y coord & scale
double vig_x_d, vig_y_d; double vig_x_d = 0., vig_y_d = 0.;
if (needsVignetting()) { if (needsVignetting()) {
vig_x_d = ascale * (x + cx - vig_w2); // centering x coord & scale vig_x_d = ascale * (x + cx - vig_w2); // centering x coord & scale
@@ -834,7 +834,7 @@ void ImProcFunctions::transformHighQuality (Imagefloat* original, Imagefloat* tr
s = 1.0 - distAmount + distAmount * r ; s = 1.0 - distAmount + distAmount * r ;
} }
double r2; double r2 = 0.;
if (needsVignetting()) { if (needsVignetting()) {
double vig_Dx = vig_x_d * cost - vig_y_d * sint; double vig_Dx = vig_x_d * cost - vig_y_d * sint;
@@ -982,7 +982,7 @@ void ImProcFunctions::transformPreview (Imagefloat* original, Imagefloat* transf
y_d = ascale * (y_d + cy - h2); // centering y coord & scale y_d = ascale * (y_d + cy - h2); // centering y coord & scale
x_d = ascale * (x_d + cx - w2); // centering x coord & scale x_d = ascale * (x_d + cx - w2); // centering x coord & scale
double vig_x_d, vig_y_d; double vig_x_d = 0., vig_y_d = 0.;
if (needsVignetting()) { if (needsVignetting()) {
vig_x_d = ascale * (x + cx - vig_w2); // centering x coord & scale vig_x_d = ascale * (x + cx - vig_w2); // centering x coord & scale
@@ -1013,7 +1013,7 @@ void ImProcFunctions::transformPreview (Imagefloat* original, Imagefloat* transf
Dy *= s; Dy *= s;
} }
double r2; double r2 = 0.;
if (needsVignetting()) { if (needsVignetting()) {
double vig_Dx = vig_x_d * cost - vig_y_d * sint; double vig_Dx = vig_x_d * cost - vig_y_d * sint;

3
rtengine/ipvibrance.cc
View File

@@ -33,6 +33,7 @@
#include <omp.h> #include <omp.h>
#endif #endif
using namespace std; using namespace std;
namespace rtengine namespace rtengine
@@ -534,7 +535,7 @@ void ImProcFunctions::vibrance (LabImage* lab)
} }
} }
float chmodpastel, chmodsat; float chmodpastel = 0.f, chmodsat = 0.f;
// variables to improve transitions // variables to improve transitions
float pa, pb;// transition = pa*saturation + pb float pa, pb;// transition = pa*saturation + pb
float chl00 = chromaPastel * satredu * sathue[4]; float chl00 = chromaPastel * satredu * sathue[4];