merge with dev

2018-11-01 17:34:21 +01:00
parent b9c7fa80da 5e30b5ac58
commit 19d71e46d4
19 changed files with 955 additions and 92 deletions
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -130,6 +130,7 @@ set(RTENGINESOURCEFILES
    ipsoftlight.cc
    guidedfilter.cc
    ipdehaze.cc
+    iplabregions.cc
    )

 if(LENSFUN_HAS_LOAD_DIRECTORY)