merge with dev

2018-05-05 09:37:58 +02:00
parent c6b0deb5dd eab7483431
commit df6822178c
115 changed files with 1924 additions and 3142 deletions
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -121,6 +121,8 @@ set(RTENGINESOURCEFILES
    histmatching.cc
    pdaflinesfilter.cc
    gamutwarning.cc
+    ipshadowshighlights.cc
+    xtrans_demosaic.cc
    )

 if(LENSFUN_HAS_LOAD_DIRECTORY)