Merge branch 'dev' into procparams-cleanup

2017-11-20 20:40:57 +01:00
parent 5734e546d8 d47e7f67b2
commit b98a3944a6
114 changed files with 2290 additions and 2680 deletions
--- a/rtengine/fast_demo.cc
+++ b/rtengine/fast_demo.cc
@@ -52,7 +52,7 @@ LUTf RawImageSource::initInvGrad()
 #endif
 //LUTf RawImageSource::invGrad = RawImageSource::initInvGrad();

-SSEFUNCTION void RawImageSource::fast_demosaic(int winx, int winy, int winw, int winh)
+SSEFUNCTION void RawImageSource::fast_demosaic()
 {

    double progress = 0.0;