Merge branch 'std_cpp11-dev' into dev (fixes #3635)

2017-02-21 20:37:21 +01:00
parent ac882d2ff2 f3090d146f
commit d2b4fe5e54
26 changed files with 303 additions and 267 deletions
--- a/rtengine/ipresize.cc
+++ b/rtengine/ipresize.cc
@@ -37,7 +37,7 @@ static inline float Lanc(float x, float a)
    } else if (x * x > a * a) {
        return 0.0f;
    } else {
-        x = static_cast<float>(M_PI) * x;
+        x = static_cast<float>(rtengine::RT_PI) * x;
        return a * xsinf(x) * xsinf(x / a) / (x * x);
    }
 }