merge with Dev

2018-03-26 14:59:08 +02:00
parent 34594d357f 4511b693e1
commit 1062869d01
73 changed files with 1381 additions and 136 deletions
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -119,6 +119,8 @@ set(RTENGINESOURCEFILES
    tmo_fattal02.cc
    iplocalcontrast.cc
    histmatching.cc
+    pdaflinesfilter.cc
+    gamutwarning.cc
    )

 if(LENSFUN_HAS_LOAD_DIRECTORY)