Merge branch 'dev' into spot-removal-tool (#2239)

2018-01-25 20:41:10 +01:00
parent e6659be98e c0ceeb2c95
commit b6d2480fb5
183 changed files with 9182 additions and 5571 deletions
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -117,12 +117,17 @@ set(RTENGINESOURCEFILES
    utils.cc
    rtlensfun.cc
    tmo_fattal02.cc
+    iplocalcontrast.cc
+    histmatching.cc
    )

 if(LENSFUN_HAS_LOAD_DIRECTORY)
    set_source_files_properties(rtlensfun.cc PROPERTIES COMPILE_DEFINITIONS RT_LENSFUN_HAS_LOAD_DIRECTORY)
 endif()

+if(WITH_BENCHMARK)
+    add_definitions(-DBENCHMARK)
+endif()

 if(NOT WITH_SYSTEM_KLT)
    set(RTENGINESOURCEFILES ${RTENGINESOURCEFILES}