merge with dev

2018-07-07 13:46:18 +02:00
parent c1463c7edd 523fe40662
commit e65c6786ff
92 changed files with 2399 additions and 1322 deletions
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -33,7 +33,6 @@ set(RTENGINESOURCEFILES
    FTblockDN.cc
    PF_correct_RT.cc
    amaze_demosaic_RT.cc
-    amaze_vng4_demosaic_RT.cc
    cJSON.c
    calc_distort.cc
    camconst.cc
@@ -53,6 +52,7 @@ set(RTENGINESOURCEFILES
    dfmanager.cc
    diagonalcurves.cc
    dirpyr_equalizer.cc
+    dual_demosaic_RT.cc
    dynamicprofile.cc
    expo_before_b.cc
    fast_demo.cc
@@ -125,6 +125,7 @@ set(RTENGINESOURCEFILES
    ipshadowshighlights.cc
    xtrans_demosaic.cc
    vng4_demosaic_RT.cc
+    ipsoftlight.cc
    )

 if(LENSFUN_HAS_LOAD_DIRECTORY)