From 9bb19eb1a305835d59bf56cdad20cfa7d492128f Mon Sep 17 00:00:00 2001
From: Hombre57 <natureh.510@gmail.com>
Date: Sun, 8 Dec 2019 02:01:03 +0100
Subject: [PATCH] Post-merge bugfix

---
 rtengine/improccoordinator.cc | 2 --
 rtengine/improcfun.h          | 4 +++-
 rtengine/spot.cc              | 3 +++
 rtgui/editwidgets.h           | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc
index 684d34e01..d8d9b2d82 100644
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -576,8 +576,6 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
             spotprev->copyData(oprevi);
         }
         
-        readyphase++;
-
         if ((todo & M_HDR) && (params->fattal.enabled || params->dehaze.enabled)) {
             if (fattal_11_dcrop_cache) {
                 delete fattal_11_dcrop_cache;
diff --git a/rtengine/improcfun.h b/rtengine/improcfun.h
index 995288e7a..a9f0d4eeb 100644
--- a/rtengine/improcfun.h
+++ b/rtengine/improcfun.h
@@ -56,6 +56,8 @@ class Image8;
 class Imagefloat;
 class LabImage;
 class wavelet_decomposition;
+class ImageSource;
+class ColorTemp;
 
 namespace procparams
 {
@@ -248,7 +250,7 @@ public:
     float MadRgb(const float * DataList, int datalen);
 
     // spot removal tool
-    void removeSpots (Imagefloat* img, ImageSource* imgsrc, const std::vector<SpotEntry> &entries, const PreviewProps &pp, const ColorTemp &currWB, const ColorManagementParams *cmp, int tr);
+    void removeSpots (rtengine::Imagefloat* img, rtengine::ImageSource* imgsrc, const std::vector<procparams::SpotEntry> &entries, const PreviewProps &pp, const rtengine::ColorTemp &currWB, const procparams::ColorManagementParams *cmp, int tr);
 
     // pyramid wavelet
     void dirpyr_equalizer(const float * const * src, float ** dst, int srcwidth, int srcheight, const float * const * l_a, const float * const * l_b, const double * mult, double dirpyrThreshold, double skinprot, float b_l, float t_l, float t_r, int scale);    //Emil's directional pyramid wavelet
diff --git a/rtengine/spot.cc b/rtengine/spot.cc
index 9d059ee1c..cd19cc62a 100644
--- a/rtengine/spot.cc
+++ b/rtengine/spot.cc
@@ -21,7 +21,10 @@
 #include "alpha.h"
 #include "procparams.h"
 #include "imagesource.h"
+#include "imagefloat.h"
+#include "rt_math.h"
 #include <iostream>
+#include <set>
 
 namespace rtengine
 {
diff --git a/rtgui/editwidgets.h b/rtgui/editwidgets.h
index 2dcd5274c..d814f0918 100644
--- a/rtgui/editwidgets.h
+++ b/rtgui/editwidgets.h
@@ -24,11 +24,11 @@
 #include <glibmm/ustring.h>
 
 #include "editcoordsys.h"
+#include "rtsurface.h"
 #include "../rtengine/coord.h"
 #include "../rtengine/rt_math.h"
 
 class ObjectMOBuffer;
-class RTSurface;
 
 /** @file
  *