Merge branch 'dev' into newlocallab

2019-03-12 14:57:17 +01:00
parent 4756e5184c 86690f1ca0
commit 020204e0cb
150 changed files with 1822 additions and 1298 deletions
--- a/rtengine/ipshadowshighlights.cc
+++ b/rtengine/ipshadowshighlights.cc
@@ -19,10 +19,12 @@
 */

 #include "improcfun.h"
+
 #include "gauss.h"
-#include "sleef.c"
-#include "opthelper.h"
 #include "guidedfilter.h"
+#include "opthelper.h"
+#include "procparams.h"
+#include "sleef.c"

 namespace rtengine {
 //modifications to pass parameters needs by locallab, to avoid 2 functions - no change in process - J.Desmis march 2019