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/dcrop.h
+++ b/rtengine/dcrop.h
@@ -21,8 +21,6 @@
 #include "improccoordinator.h"
 #include "rtengine.h"
 #include "improcfun.h"
-#include "image8.h"
-#include "image16.h"
 #include "imagesource.h"
 #include "procevents.h"
 #include "pipettebuffer.h"
@@ -31,6 +29,8 @@
 namespace rtengine
 {

+class Image8;
+
 using namespace procparams;

 class ImProcCoordinator;