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

Fix Clang warnings and build failure on OSX 10.12

Browse Source 
Kudos to Partha over at pixls.us for finding and fixing!
This commit is contained in:
Flössie
2016-11-06 17:09:27 +01:00
parent 2bf87d5c5c
commit 495c0938f4
6 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/iptransform.cc
View File

@@ -794,12 +794,13 @@ void ImProcFunctions::transformHighQuality (Imagefloat* original, Imagefloat* tr
// multiplier for vignetting correction
double vignmul = 1.0;
if (needsVignetting())
if (needsVignetting()) {
if(darkening) {
vignmul /= std::max(v + mul * tanh (b * (maxRadius - s * r2) / maxRadius), 0.001);
} else {
vignmul *= (v + mul * tanh (b * (maxRadius - s * r2) / maxRadius));
}
}
if (needsGradient()) {
vignmul *= calcGradientFactor(gp, cx + x, cy + y);
@@ -963,12 +964,13 @@ void ImProcFunctions::transformPreview (Imagefloat* original, Imagefloat* transf
// multiplier for vignetting correction
double vignmul = 1.0;
if (needsVignetting())
if (needsVignetting()) {
if(darkening) {
vignmul /= std::max(v + mul * tanh (b * (maxRadius - s * r2) / maxRadius), 0.001);
} else {
vignmul = v + mul * tanh (b * (maxRadius - s * r2) / maxRadius);
}
}
if (needsGradient()) {
vignmul *= calcGradientFactor(gp, cx + x, cy + y);