From 22e5348db7560800a415913818c9b39528adff32 Mon Sep 17 00:00:00 2001 From: Ingo Weyrich Date: Mon, 28 Oct 2019 17:17:15 +0100 Subject: [PATCH] Forward declare LabImage --- rtengine/FTblockDN.cc | 1 + rtengine/PF_correct_RT.cc | 1 + rtengine/color.h | 1 - rtengine/dcrop.cc | 1 + rtengine/imagefloat.cc | 1 + rtengine/imagefloat.h | 1 + rtengine/improccoordinator.cc | 1 + rtengine/improcfun.cc | 1 + rtengine/improcfun.h | 2 +- rtengine/iplab2rgb.cc | 1 + rtengine/iplabregions.cc | 1 + rtengine/iplocalcontrast.cc | 1 + rtengine/ipresize.cc | 1 + rtengine/ipshadowshighlights.cc | 1 + rtengine/ipsharpen.cc | 1 + rtengine/ipsoftlight.cc | 1 + rtengine/ipvibrance.cc | 1 + rtengine/ipwavelet.cc | 1 + rtengine/labimage.cc | 1 - rtengine/labimage.h | 6 +++--- rtengine/pipettebuffer.cc | 1 + rtengine/pipettebuffer.h | 1 + rtengine/rtthumbnail.cc | 1 + rtengine/simpleprocess.cc | 1 + 24 files changed, 24 insertions(+), 6 deletions(-) diff --git a/rtengine/FTblockDN.cc b/rtengine/FTblockDN.cc index 8fd0ba29e..117d8740a 100644 --- a/rtengine/FTblockDN.cc +++ b/rtengine/FTblockDN.cc @@ -30,6 +30,7 @@ #include "LUT.h" #include "array2D.h" #include "iccmatrices.h" +#include "labimage.h" #include "boxblur.h" #include "rt_math.h" #include "mytime.h" diff --git a/rtengine/PF_correct_RT.cc b/rtengine/PF_correct_RT.cc index 98c399bff..eb450dce9 100644 --- a/rtengine/PF_correct_RT.cc +++ b/rtengine/PF_correct_RT.cc @@ -30,6 +30,7 @@ #include "gauss.h" #include "improcfun.h" #include "cieimage.h" +#include "labimage.h" #include "sleef.c" #include "../rtgui/myflatcurve.h" #include "rt_math.h" diff --git a/rtengine/color.h b/rtengine/color.h index 2acf675d4..d0053470e 100644 --- a/rtengine/color.h +++ b/rtengine/color.h @@ -24,7 +24,6 @@ #include "rt_math.h" #include "LUT.h" -#include "labimage.h" #include "iccmatrices.h" #include "lcms2.h" #include "sleef.c" diff --git a/rtengine/dcrop.cc b/rtengine/dcrop.cc index 41e052b3e..fe904527e 100644 --- a/rtengine/dcrop.cc +++ b/rtengine/dcrop.cc @@ -19,6 +19,7 @@ */ #include "cieimage.h" +#include "labimage.h" #include "curves.h" #include "dcrop.h" #include "mytime.h" diff --git a/rtengine/imagefloat.cc b/rtengine/imagefloat.cc index 8a9a511a6..0b67e0785 100644 --- a/rtengine/imagefloat.cc +++ b/rtengine/imagefloat.cc @@ -20,6 +20,7 @@ #include "imagefloat.h" #include "image16.h" #include "image8.h" +#include "labimage.h" #include #include "rtengine.h" #include "mytime.h" diff --git a/rtengine/imagefloat.h b/rtengine/imagefloat.h index 261a0677c..5250e16e8 100644 --- a/rtengine/imagefloat.h +++ b/rtengine/imagefloat.h @@ -31,6 +31,7 @@ using namespace procparams; class Image8; class Image16; +class LabImage; /* * Image type used by most tools; expected range: [0.0 ; 65535.0] diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc index 5633f77fa..c12e8132c 100644 --- a/rtengine/improccoordinator.cc +++ b/rtengine/improccoordinator.cc @@ -18,6 +18,7 @@ */ #include "improccoordinator.h" #include "cieimage.h" +#include "labimage.h" #include "curves.h" #include "mytime.h" #include "refreshmap.h" diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc index 56eaeaa55..e446f21a0 100644 --- a/rtengine/improcfun.cc +++ b/rtengine/improcfun.cc @@ -25,6 +25,7 @@ #include "alignedbuffer.h" #include "cieimage.h" +#include "labimage.h" #include "rtengine.h" #include "improcfun.h" #include "curves.h" diff --git a/rtengine/improcfun.h b/rtengine/improcfun.h index 41e4704b9..05c06e0ef 100644 --- a/rtengine/improcfun.h +++ b/rtengine/improcfun.h @@ -25,7 +25,6 @@ #include "shmap.h" #include "coord2d.h" #include "color.h" -#include "labimage.h" #include "LUT.h" #include "lcp.h" #include "dcp.h" @@ -36,6 +35,7 @@ namespace rtengine { class CieImage; +class LabImage; class wavelet_decomposition; namespace procparams diff --git a/rtengine/iplab2rgb.cc b/rtengine/iplab2rgb.cc index 14aeb4049..8854331e4 100644 --- a/rtengine/iplab2rgb.cc +++ b/rtengine/iplab2rgb.cc @@ -17,6 +17,7 @@ * along with RawTherapee. If not, see . */ #include "rtengine.h" +#include "labimage.h" #include "improcfun.h" #include #include "iccstore.h" diff --git a/rtengine/iplabregions.cc b/rtengine/iplabregions.cc index af6567c3c..2462959bf 100644 --- a/rtengine/iplabregions.cc +++ b/rtengine/iplabregions.cc @@ -23,6 +23,7 @@ #endif #include "improcfun.h" +#include "labimage.h" #include "guidedfilter.h" #include "procparams.h" //#define BENCHMARK diff --git a/rtengine/iplocalcontrast.cc b/rtengine/iplocalcontrast.cc index 6143f48a3..4e6c32e7e 100644 --- a/rtengine/iplocalcontrast.cc +++ b/rtengine/iplocalcontrast.cc @@ -28,6 +28,7 @@ #include "array2D.h" #include "gauss.h" +#include "labimage.h" #include "improcfun.h" #include "procparams.h" diff --git a/rtengine/ipresize.cc b/rtengine/ipresize.cc index 0c1fb1ad8..601ec146d 100644 --- a/rtengine/ipresize.cc +++ b/rtengine/ipresize.cc @@ -20,6 +20,7 @@ #include "improcfun.h" #include "alignedbuffer.h" +#include "labimage.h" #include "opthelper.h" #include "rt_math.h" #include "procparams.h" diff --git a/rtengine/ipshadowshighlights.cc b/rtengine/ipshadowshighlights.cc index cddc8734b..7680ae6c7 100644 --- a/rtengine/ipshadowshighlights.cc +++ b/rtengine/ipshadowshighlights.cc @@ -22,6 +22,7 @@ #include "gauss.h" #include "guidedfilter.h" +#include "labimage.h" #include "opthelper.h" #include "procparams.h" #include "sleef.c" diff --git a/rtengine/ipsharpen.cc b/rtengine/ipsharpen.cc index 0ba94a7c4..1b3ab6270 100644 --- a/rtengine/ipsharpen.cc +++ b/rtengine/ipsharpen.cc @@ -19,6 +19,7 @@ #include "improcfun.h" #include "cieimage.h" +#include "labimage.h" #include "gauss.h" #include "bilateral2.h" #include "jaggedarray.h" diff --git a/rtengine/ipsoftlight.cc b/rtengine/ipsoftlight.cc index cd49e858f..e0dc6aa40 100644 --- a/rtengine/ipsoftlight.cc +++ b/rtengine/ipsoftlight.cc @@ -20,6 +20,7 @@ */ #include "improcfun.h" +#include "labimage.h" #include "procparams.h" diff --git a/rtengine/ipvibrance.cc b/rtengine/ipvibrance.cc index a7199064a..365dff587 100644 --- a/rtengine/ipvibrance.cc +++ b/rtengine/ipvibrance.cc @@ -23,6 +23,7 @@ #include "rtengine.h" #include "improcfun.h" #include "iccstore.h" +#include "labimage.h" #include "mytime.h" #include "../rtgui/thresholdselector.h" #include "curves.h" diff --git a/rtengine/ipwavelet.cc b/rtengine/ipwavelet.cc index 6631aae32..078b9d585 100644 --- a/rtengine/ipwavelet.cc +++ b/rtengine/ipwavelet.cc @@ -30,6 +30,7 @@ #include "rtengine.h" #include "improcfun.h" +#include "labimage.h" #include "LUT.h" #include "array2D.h" #include "rt_math.h" diff --git a/rtengine/labimage.cc b/rtengine/labimage.cc index b31bc89a1..153af4c75 100644 --- a/rtengine/labimage.cc +++ b/rtengine/labimage.cc @@ -17,7 +17,6 @@ * along with RawTherapee. If not, see . */ -#include #include #include "labimage.h" diff --git a/rtengine/labimage.h b/rtengine/labimage.h index bcc2484ab..79f003b07 100644 --- a/rtengine/labimage.h +++ b/rtengine/labimage.h @@ -16,8 +16,9 @@ * You should have received a copy of the GNU General Public License * along with RawTherapee. If not, see . */ -#ifndef _LABIMAGE_H_ -#define _LABIMAGE_H_ +#pragma once + +#include namespace rtengine { @@ -45,4 +46,3 @@ public: }; } -#endif diff --git a/rtengine/pipettebuffer.cc b/rtengine/pipettebuffer.cc index d915381ef..11cf50ae9 100644 --- a/rtengine/pipettebuffer.cc +++ b/rtengine/pipettebuffer.cc @@ -20,6 +20,7 @@ #include "pipettebuffer.h" #include "imagefloat.h" +#include "labimage.h" #include "../rtgui/editcallbacks.h" diff --git a/rtengine/pipettebuffer.h b/rtengine/pipettebuffer.h index 01b24720c..ef8a5f69a 100644 --- a/rtengine/pipettebuffer.h +++ b/rtengine/pipettebuffer.h @@ -31,6 +31,7 @@ namespace rtengine { class Imagefloat; +class LabImage; /// @brief Structure that contains information about and pointers to the Edit buffer class PipetteBuffer diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc index 704721e3f..b30bf3eb4 100644 --- a/rtengine/rtthumbnail.cc +++ b/rtengine/rtthumbnail.cc @@ -17,6 +17,7 @@ * along with RawTherapee. If not, see . */ #include "cieimage.h" +#include "labimage.h" #include "rtengine.h" #include "rtthumbnail.h" #include "../rtgui/options.h" diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc index 5a43e0a21..2eb640fca 100644 --- a/rtengine/simpleprocess.cc +++ b/rtengine/simpleprocess.cc @@ -17,6 +17,7 @@ * along with RawTherapee. If not, see . */ #include "cieimage.h" +#include "labimage.h" #include "rtengine.h" #include "colortemp.h" #include "imagesource.h"