Merge branch 'dev' into metadata-exiv2

2019-07-09 13:34:19 +02:00
parent 8df4973610 3b78a5c227
commit 21a97980b6
70 changed files with 1341 additions and 1103 deletions
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -31,6 +31,7 @@ link_directories(
 set(CAMCONSTSFILE "camconst.json")

 set(RTENGINESOURCEFILES
+    badpixels.cc
    CA_correct_RT.cc
    EdgePreservingDecomposition.cc
    FTblockDN.cc