merge with dev

2018-11-01 08:37:28 +01:00
parent 21292f6db5 86b282fc68
commit b9c7fa80da
75 changed files with 1248 additions and 378 deletions
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -129,6 +129,7 @@ set(RTENGINESOURCEFILES
    vng4_demosaic_RT.cc
    ipsoftlight.cc
    guidedfilter.cc
+    ipdehaze.cc
    )

 if(LENSFUN_HAS_LOAD_DIRECTORY)