Merge branch 'dev' into spot-removal-tool

2019-07-31 23:03:50 +02:00
parent 56b2649cd2 2283d1c969
commit 437d883082
269 changed files with 5554 additions and 33357 deletions
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -30,6 +30,7 @@ link_directories("${PROJECT_SOURCE_DIR}/rtexif"
 set(CAMCONSTSFILE "camconst.json")

 set(RTENGINESOURCEFILES
+    badpixels.cc
    CA_correct_RT.cc
    EdgePreservingDecomposition.cc
    FTblockDN.cc
@@ -61,6 +62,8 @@ set(RTENGINESOURCEFILES
    eahd_demosaic.cc
    fast_demo.cc
    ffmanager.cc
+    filmnegativeproc.cc
+    filmnegativethumb.cc
    flatcurves.cc
    gauss.cc
    green_equil_RT.cc