Merge branch 'dev' into metadata-exiv2

- Rating (#5325) not yet implemented
2019-09-24 14:30:54 +02:00
parent 21a97980b6 5b72cc0dd3
commit 28f0bc14da
539 changed files with 7707 additions and 5098 deletions
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -33,6 +33,7 @@ set(CAMCONSTSFILE "camconst.json")
 set(RTENGINESOURCEFILES
    badpixels.cc
    CA_correct_RT.cc
+    capturesharpening.cc
    EdgePreservingDecomposition.cc
    FTblockDN.cc
    PF_correct_RT.cc
@@ -62,6 +63,8 @@ set(RTENGINESOURCEFILES
    eahd_demosaic.cc
    fast_demo.cc
    ffmanager.cc
+    filmnegativeproc.cc
+    filmnegativethumb.cc
    flatcurves.cc
    gauss.cc
    green_equil_RT.cc