merge with dev

2019-02-02 19:29:03 +01:00
parent 9b6bd50410 b0b0e136ba
commit d24999b1f8
4 changed files with 354 additions and 276 deletions
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -63,6 +63,7 @@ set(RTENGINESOURCEFILES
    gauss.cc
    green_equil_RT.cc
    hilite_recon.cc
+    hphd_demosaic_RT.cc
    iccjpeg.cc
    iccstore.cc
    icons.cc