Merge branch 'dev' into newlocallab

2020-02-07 18:24:50 +01:00
parent ff8c0748e9 aae22fcc86
commit c984a95b9e
83 changed files with 1676 additions and 1767 deletions
--- a/rtengine/ipdehaze.cc
+++ b/rtengine/ipdehaze.cc
@@ -32,6 +32,7 @@
 #include <iostream>
 #include <vector>

+#include "array2D.h"
 #include "color.h"
 #include "guidedfilter.h"
 #include "iccstore.h"