merge with dev

2019-12-07 06:13:35 +01:00
parent 535af979de 838a14ccd9
commit eb45fa1eda
4 changed files with 826 additions and 987 deletions
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -105,6 +105,7 @@ set(RTENGINESOURCEFILES
    labimage.cc
    lcp.cc
    lj92.c
+    lmmse_demosaic.cc
    loadinitial.cc
    myfile.cc
    panasonic_decoders.cc