merge with dev

2018-01-26 18:00:33 +01:00
parent 62d9825bce 24151b313a
commit 4a29e34e20
51 changed files with 591 additions and 377 deletions
--- a/rtengine/ipsharpen.cc
+++ b/rtengine/ipsharpen.cc
@@ -34,7 +34,7 @@ namespace rtengine
 #define ABS(a) ((a)<0?-(a):(a))

 extern const Settings* settings;
-SSEFUNCTION void ImProcFunctions::dcdamping (float** aI, float** aO, float damping, int W, int H)
+void ImProcFunctions::dcdamping (float** aI, float** aO, float damping, int W, int H)
 {

    const float dampingFac = -2.0 / (damping * damping);