merge with dev

2018-10-19 19:26:14 +02:00
parent bda6ad9235 72699902a3
commit e7448bd084
198 changed files with 2052 additions and 1128 deletions
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -128,6 +128,7 @@ set(RTENGINESOURCEFILES
    xtrans_demosaic.cc
    vng4_demosaic_RT.cc
    ipsoftlight.cc
+    guidedfilter.cc
    )

 if(LENSFUN_HAS_LOAD_DIRECTORY)