Merge branch 'dev' into fix-double-promotion

2020-02-09 16:45:20 +01:00
parent 914daffa39 0aec0fe0e9
commit b627adea3a
145 changed files with 4907 additions and 3828 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"