merge with dev

2019-07-18 13:41:26 +02:00
parent 1add88a9ae 4a6956d91e
commit cbeb828609
52 changed files with 1853 additions and 463 deletions
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -61,6 +61,8 @@ set(RTENGINESOURCEFILES
    eahd_demosaic.cc
    fast_demo.cc
    ffmanager.cc
+    filmnegativeproc.cc
+    filmnegativethumb.cc
    flatcurves.cc
    gauss.cc
    green_equil_RT.cc