merge with dev

2019-11-06 08:30:51 +01:00
parent 4a46aeac13 9ddd2a2a9b
commit e4f94f9f33
18 changed files with 181 additions and 416 deletions
--- a/rtengine/rtthumbnail.cc
+++ b/rtengine/rtthumbnail.cc
@@ -31,15 +31,12 @@
 #include "colortemp.h"
 #include "curves.h"
 #include "dcp.h"
-#include "iccmatrices.h"
 #include "iccstore.h"
 #include "image8.h"
-#include "improccoordinator.h"
 #include "improcfun.h"
 #include "jpeg.h"
 #include "labimage.h"
 #include "median.h"
-#include "mytime.h"
 #include "procparams.h"
 #include "rawimage.h"
 #include "rawimagesource.h"
@@ -50,8 +47,6 @@
 #include "StopWatch.h"
 #include "utils.h"

-#include "../rtgui/ppversion.h"
-
 namespace
 {