merge with dev

2019-11-20 12:57:44 +01:00
parent 6ebc03b638 c21d142098
commit 1f329bded2
12 changed files with 3528 additions and 17 deletions
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -34,6 +34,7 @@ set(RTENGINESOURCEFILES
    amaze_demosaic_RT.cc
    badpixels.cc
    boxblur.cc
+    canon_cr3_decoder.cc
    CA_correct_RT.cc
    calc_distort.cc
    camconst.cc