solved merge conflicts for merge from dev into newlocallab

2017-11-15 16:49:53 +01:00
parent 0ac7744347 3f1e47d3d5
commit 0df571b2db
63 changed files with 1212 additions and 1927 deletions
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -72,6 +72,7 @@ set(RTENGINESOURCEFILES
    imageio.cc
    improccoordinator.cc
    improcfun.cc
+    impulse_denoise.cc
    init.cc
    iplab2rgb.cc
 	iplocallab.cc