Merge branch 'dev' into newlocallab

2019-11-04 23:01:33 +01:00
parent 91b80b23d2 ec5eaf9cea
commit 033d9fe02a
395 changed files with 2523 additions and 2740 deletions
--- a/rtengine/ipvibrance.cc
+++ b/rtengine/ipvibrance.cc
@@ -23,16 +23,11 @@
 #include "rtengine.h"
 #include "improcfun.h"
 #include "iccstore.h"
-#include "mytime.h"
-#include "../rtgui/thresholdselector.h"
+#include "labimage.h"
 #include "curves.h"
 #include "color.h"
 #include "procparams.h"
 #include "StopWatch.h"
-#ifdef _OPENMP
-#include <omp.h>
-#endif
-

 using namespace std;