Merge branch 'dev' into newlocallab

2020-02-07 18:24:50 +01:00
parent ff8c0748e9 aae22fcc86
commit c984a95b9e
83 changed files with 1676 additions and 1767 deletions
--- a/rtengine/dcrop.h
+++ b/rtengine/dcrop.h
@@ -18,11 +18,7 @@
 */
 #pragma once

-#include "improccoordinator.h"
 #include "rtengine.h"
-#include "improcfun.h"
-#include "imagesource.h"
-#include "procevents.h"
 #include "pipettebuffer.h"
 #include "../rtgui/threadutils.h"

@@ -30,12 +26,13 @@ namespace rtengine
 {

 class Image8;
+class CieImage;

 using namespace procparams;

 class ImProcCoordinator;

-class Crop : public DetailedCrop, public PipetteBuffer
+class Crop final : public DetailedCrop, public PipetteBuffer
 {

 protected: