Merge branch 'dev' into pfcorrect-cleanup

2018-03-20 14:26:55 +01:00
parent 477f26da1d 5dee5d4df4
commit 196e88473a
22 changed files with 525 additions and 363 deletions
--- a/rtengine/PF_correct_RT.cc
+++ b/rtengine/PF_correct_RT.cc
@@ -35,7 +35,6 @@
 #include "opthelper.h"
 #include "median.h"
 #include "jaggedarray.h"
-#define BENCHMARK
 #include "StopWatch.h"

 namespace rtengine