merge with dev

2018-11-11 10:02:38 +01:00
parent fd720007c2 757c1da292
commit 333ac99532
10 changed files with 885 additions and 24 deletions
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -131,6 +131,7 @@ set(RTENGINESOURCEFILES
    guidedfilter.cc
    ipdehaze.cc
    iplabregions.cc
+    lj92.c
    )

 if(LENSFUN_HAS_LOAD_DIRECTORY)