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

rtengine/CMakeLists.txt

@@ -9,6 +9,7 @@ include_directories(${EXTRA_INCDIR}
     ${GTK_INCLUDE_DIRS}
     ${IPTCDATA_INCLUDE_DIRS}
     ${LCMS_INCLUDE_DIRS}
+    ${LENSFUN_INCLUDE_DIRS}
     )
 
 link_directories("${PROJECT_SOURCE_DIR}/rtexif"
@@ -21,6 +22,7 @@ link_directories("${PROJECT_SOURCE_DIR}/rtexif"
     ${GTHREAD_LIBRARY_DIRS}
     ${IPTCDATA_LIBRARY_DIRS}
     ${LCMS_LIBRARY_DIRS}
+    ${LENSFUN_LIBRARY_DIRS}
     )
 
 set(CAMCONSTSFILE "camconst.json")
@@ -71,6 +73,7 @@ set(RTENGINESOURCEFILES
     imageio.cc
     improccoordinator.cc
     improcfun.cc
+    impulse_denoise.cc
     init.cc
     iplab2rgb.cc
     ipresize.cc
@@ -111,8 +114,15 @@ set(RTENGINESOURCEFILES
     spot.cc
     stdimagesource.cc
     utils.cc
+    rtlensfun.cc
+    tmo_fattal02.cc
     )
 
+if(LENSFUN_HAS_LOAD_DIRECTORY)
+    set_source_files_properties(rtlensfun.cc PROPERTIES COMPILE_DEFINITIONS RT_LENSFUN_HAS_LOAD_DIRECTORY)
+endif()
+
+
 if(NOT WITH_SYSTEM_KLT)
     set(RTENGINESOURCEFILES ${RTENGINESOURCEFILES}
         klt/convolve.cc
@@ -155,6 +165,7 @@ target_link_libraries(rtengine rtexif
     ${PNG_LIBRARIES}
     ${TIFF_LIBRARIES}
     ${ZLIB_LIBRARIES}
+    ${LENSFUN_LIBRARIES}
     )
 
 install(FILES ${CAMCONSTSFILE} DESTINATION "${DATADIR}" PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)