merge with dev

2017-12-21 08:42:43 +01:00
parent a017505cec 62585bc434
commit 46181f1008
43 changed files with 878 additions and 75 deletions
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -116,6 +116,7 @@ set(RTENGINESOURCEFILES
    utils.cc
    rtlensfun.cc
    tmo_fattal02.cc
+    iplocalcontrast.cc
    )

 if(LENSFUN_HAS_LOAD_DIRECTORY)