merge with dev..

2018-06-14 09:06:29 +02:00
parent 03fb04cd81 e3cb9130a1
commit c1463c7edd
87 changed files with 1674 additions and 790 deletions
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -33,6 +33,7 @@ set(RTENGINESOURCEFILES
    FTblockDN.cc
    PF_correct_RT.cc
    amaze_demosaic_RT.cc
+    amaze_vng4_demosaic_RT.cc
    cJSON.c
    calc_distort.cc
    camconst.cc
@@ -123,6 +124,7 @@ set(RTENGINESOURCEFILES
    gamutwarning.cc
    ipshadowshighlights.cc
    xtrans_demosaic.cc
+    vng4_demosaic_RT.cc
    )

 if(LENSFUN_HAS_LOAD_DIRECTORY)