merge with dev

2018-08-22 18:21:40 +02:00
parent 5472673b9e 3e7f19c81b
commit 47f0564d25
140 changed files with 3185 additions and 1208 deletions
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -32,6 +32,7 @@ set(RTENGINESOURCEFILES
    EdgePreservingDecomposition.cc
    FTblockDN.cc
    PF_correct_RT.cc
+    ahd_demosaic_RT.cc
    amaze_demosaic_RT.cc
    cJSON.c
    calc_distort.cc
@@ -54,6 +55,7 @@ set(RTENGINESOURCEFILES
    dirpyr_equalizer.cc
    dual_demosaic_RT.cc
    dynamicprofile.cc
+    eahd_demosaic.cc
    expo_before_b.cc
    fast_demo.cc
    ffmanager.cc