merge with dev

2018-01-22 08:56:24 +01:00
parent 6cdbba2a0f 5342e75289
commit cef451807d
35 changed files with 1066 additions and 47 deletions
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -117,6 +117,7 @@ set(RTENGINESOURCEFILES
    rtlensfun.cc
    tmo_fattal02.cc
    iplocalcontrast.cc
+    histmatching.cc
    )

 if(LENSFUN_HAS_LOAD_DIRECTORY)