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/ipdehaze.cc
+++ b/rtengine/ipdehaze.cc
@@ -28,13 +28,15 @@
 *
 */  

-#include "improcfun.h"
-#include "guidedfilter.h"
-#include "rt_math.h"
-#include "rt_algo.h"
 #include <iostream>
 #include <queue>

+#include "guidedfilter.h"
+#include "improcfun.h"
+#include "procparams.h"
+#include "rt_algo.h"
+#include "rt_math.h"
+
 extern Options options;

 namespace rtengine {