Forward declare ColorTemp

rtengine/ahd_demosaic_RT.cc

@@ -24,6 +24,7 @@
 //
 
 #include <cstdint>
+#include "colortemp.h"
 #include "rtengine.h"
 #include "rawimagesource.h"
 #include "rt_math.h"

rtengine/clutstore.cc

@@ -2,6 +2,7 @@
 
 #include "clutstore.h"
 
+#include "colortemp.h"
 #include "iccstore.h"
 #include "imagefloat.h"
 #include "opthelper.h"

rtengine/colortemp.h

@@ -16,8 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _COLORTEMP_
+#pragma once
-#define _COLORTEMP_
 
 #include <cmath>
 #include <map>
@@ -207,4 +206,3 @@ public:
 
 };
 }
-#endif

rtengine/dcp.h

@@ -29,12 +29,12 @@
 #include "../rtgui/threadutils.h"
 
 #include "curves.h"
-#include "colortemp.h"
 #include "noncopyable.h"
 
 namespace rtengine
 {
 
+class ColorTemp;
 class Imagefloat;
 
 class DCPProfile final

rtengine/dcrop.cc

@@ -18,6 +18,7 @@
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include "colortemp.h"
 #include "cieimage.h"
 #include "image8.h"
 #include "imagefloat.h"

rtengine/image16.cc

@@ -18,6 +18,7 @@
  */
 #include <cstdio>
 
+#include "colortemp.h"
 #include "image16.h"
 #include "imagefloat.h"
 #include "image8.h"

rtengine/image8.cc

@@ -18,6 +18,8 @@
  */
 #include <cstring>
 #include <cstdio>
+
+#include "colortemp.h"
 #include "image8.h"
 #include "imagefloat.h"
 #include "rtengine.h"

rtengine/imagefloat.cc

@@ -17,6 +17,8 @@
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include <tiffio.h>
+
+#include "colortemp.h"
 #include "imagefloat.h"
 #include "image16.h"
 #include "image8.h"

rtengine/imageio.h

@@ -37,11 +37,11 @@
 #include "../rtexif/rtexif.h"
 #include "imagedimensions.h"
 #include "iimage.h"
-#include "colortemp.h"
 
 namespace rtengine
 {
 
+class ColorTemp;
 class ProgressListener;
 class Imagefloat;
 

rtengine/imagesource.h

@@ -23,7 +23,6 @@
 
 #include <glibmm.h>
 
-#include "colortemp.h"
 #include "coord2d.h"
 #include "dcp.h"
 #include "imagedata.h"
@@ -32,6 +31,7 @@
 
 namespace rtengine
 {
+class ColorTemp;
 class Imagefloat;
 
 namespace procparams

rtengine/improccoordinator.cc

@@ -17,6 +17,7 @@
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "improccoordinator.h"
+
 #include "cieimage.h"
 #include "image8.h"
 #include "imagefloat.h"

rtengine/improccoordinator.h

@@ -21,6 +21,7 @@
 
 #include <memory>
 
+#include "colortemp.h"
 #include "rtengine.h"
 #include "improcfun.h"
 #include "imagesource.h"

rtengine/rawimagesource.h

@@ -24,6 +24,7 @@
 
 #include "array2D.h"
 #include "color.h"
+#include "colortemp.h"
 #include "curves.h"
 #include "dcp.h"
 #include "iimage.h"

rtengine/stdimagesource.h

@@ -19,6 +19,7 @@
 #ifndef _STDIMAGESOURCE_
 #define _STDIMAGESOURCE_
 
+#include "colortemp.h"
 #include "imagesource.h"
 
 namespace rtengine

rtgui/thumbnail.cc

@@ -24,6 +24,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <glibmm.h>
+#include "../rtengine/colortemp.h"
 #include "../rtengine/imagedata.h"
 #include "../rtengine/procparams.h"
 #include <glib/gstdio.h>