diff --git a/rtengine/FTblockDN.cc b/rtengine/FTblockDN.cc index 02164aded..b6245fbce 100644 --- a/rtengine/FTblockDN.cc +++ b/rtengine/FTblockDN.cc @@ -41,7 +41,6 @@ #include "opthelper.h" #include "procparams.h" #include "rt_math.h" -#include "rtengine.h" #include "sleef.c" #include "../rtgui/threadutils.h" diff --git a/rtengine/ahd_demosaic_RT.cc b/rtengine/ahd_demosaic_RT.cc index 77e342c18..88ab0bf56 100644 --- a/rtengine/ahd_demosaic_RT.cc +++ b/rtengine/ahd_demosaic_RT.cc @@ -24,11 +24,9 @@ // #include -#include "colortemp.h" #include "rtengine.h" #include "rawimagesource.h" #include "rt_math.h" -#include "procparams.h" #include "../rtgui/multilangmgr.h" #include "median.h" //#define BENCHMARK diff --git a/rtengine/amaze_demosaic_RT.cc b/rtengine/amaze_demosaic_RT.cc index 43aef0f71..41c60d4ed 100644 --- a/rtengine/amaze_demosaic_RT.cc +++ b/rtengine/amaze_demosaic_RT.cc @@ -33,7 +33,6 @@ #include "sleef.c" #include "opthelper.h" #include "median.h" -#include "procparams.h" #include "StopWatch.h" namespace rtengine diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc index eb206a15f..ae6f60cd1 100644 --- a/rtengine/dcraw.cc +++ b/rtengine/dcraw.cc @@ -26,12 +26,13 @@ /*RT*/#include /*RT*/#endif +#include #include #include #include "opthelper.h" //#define BENCHMARK #include "StopWatch.h" - +#include "utils.h" #include #include diff --git a/rtengine/dcrop.cc b/rtengine/dcrop.cc index 06c9d59bd..fd3c42f6e 100644 --- a/rtengine/dcrop.cc +++ b/rtengine/dcrop.cc @@ -19,7 +19,6 @@ */ #include "cieimage.h" -#include "colortemp.h" #include "curves.h" #include "dcp.h" #include "dcrop.h" diff --git a/rtengine/demosaic_algos.cc b/rtengine/demosaic_algos.cc index 823260129..4058534da 100644 --- a/rtengine/demosaic_algos.cc +++ b/rtengine/demosaic_algos.cc @@ -25,7 +25,6 @@ #include "rt_math.h" #include "color.h" #include "../rtgui/multilangmgr.h" -#include "procparams.h" #include "sleef.c" #include "opthelper.h" #include "median.h" diff --git a/rtengine/dfmanager.cc b/rtengine/dfmanager.cc index f5a7686e6..798836edf 100644 --- a/rtengine/dfmanager.cc +++ b/rtengine/dfmanager.cc @@ -16,20 +16,28 @@ * You should have received a copy of the GNU General Public License * along with RawTherapee. If not, see . */ -#include "dfmanager.h" -#include "../rtgui/options.h" -#include -#include "rawimage.h" + #include #include #include -#include "imagedata.h" +#include #include +#include "dfmanager.h" +#include "../rtgui/options.h" +#include "rawimage.h" +#include "imagedata.h" + namespace rtengine { // *********************** class dfInfo ************************************** +dfInfo::~dfInfo() +{ + if( ri ) { + delete ri; + } +} inline dfInfo& dfInfo::operator =(const dfInfo &o) { diff --git a/rtengine/dfmanager.h b/rtengine/dfmanager.h index e1fa38f77..216dcfc53 100644 --- a/rtengine/dfmanager.h +++ b/rtengine/dfmanager.h @@ -19,13 +19,13 @@ #pragma once #include +#include #include #include #include #include "pixelsmap.h" -#include "rawimage.h" namespace rtengine { @@ -49,13 +49,7 @@ public: dfInfo( const dfInfo &o) : pathname(o.pathname), maker(o.maker), model(o.model), iso(o.iso), shutter(o.shutter), timestamp(o.timestamp), ri(nullptr) {} - ~dfInfo() - { - if( ri ) { - delete ri; - } - } - + ~dfInfo(); dfInfo &operator =(const dfInfo &o); bool operator <(const dfInfo &e2) const; diff --git a/rtengine/eahd_demosaic.cc b/rtengine/eahd_demosaic.cc index b87c0771d..c470eb297 100644 --- a/rtengine/eahd_demosaic.cc +++ b/rtengine/eahd_demosaic.cc @@ -24,11 +24,9 @@ #include "rawimagesource.h" #include "rawimagesource_i.h" #include "jaggedarray.h" -#include "rawimage.h" #include "iccmatrices.h" #include "rt_math.h" #include "../rtgui/multilangmgr.h" -#include "procparams.h" //#define BENCHMARK #include "StopWatch.h" diff --git a/rtengine/fast_demo.cc b/rtengine/fast_demo.cc index a40f107af..82176e59c 100644 --- a/rtengine/fast_demo.cc +++ b/rtengine/fast_demo.cc @@ -25,7 +25,6 @@ #include #include "rawimagesource.h" #include "../rtgui/multilangmgr.h" -#include "procparams.h" #include "opthelper.h" using namespace std; diff --git a/rtengine/hphd_demosaic_RT.cc b/rtengine/hphd_demosaic_RT.cc index 342cd2b6b..2b61bbe07 100644 --- a/rtengine/hphd_demosaic_RT.cc +++ b/rtengine/hphd_demosaic_RT.cc @@ -22,9 +22,7 @@ #include "rawimagesource.h" #include "rawimagesource_i.h" #include "jaggedarray.h" -#include "rawimage.h" #include "rt_math.h" -#include "procparams.h" #include "../rtgui/multilangmgr.h" #include "opthelper.h" //#define BENCHMARK diff --git a/rtengine/iccstore.cc b/rtengine/iccstore.cc index 02fe4c16d..aea03664e 100644 --- a/rtengine/iccstore.cc +++ b/rtengine/iccstore.cc @@ -36,7 +36,6 @@ #include "iccmatrices.h" #include "utils.h" -#include "../rtgui/guiutils.h" #include "../rtgui/options.h" #include "../rtgui/threadutils.h" #include "lcms2_plugin.h" diff --git a/rtengine/myfile.cc b/rtengine/myfile.cc index aab45448a..842766dcf 100644 --- a/rtengine/myfile.cc +++ b/rtengine/myfile.cc @@ -18,7 +18,7 @@ */ #include "myfile.h" #include - +#include "rtengine.h" // get mmap() sorted out #ifdef MYFILE_MMAP diff --git a/rtengine/myfile.h b/rtengine/myfile.h index 69e226b8b..88b9fa62a 100644 --- a/rtengine/myfile.h +++ b/rtengine/myfile.h @@ -23,7 +23,13 @@ #include -#include "rtengine.h" +#include "opthelper.h" + +namespace rtengine { + +class ProgressListener; + +} struct IMFILE { int fd; diff --git a/rtengine/rawimage.cc b/rtengine/rawimage.cc index a69a97ab7..4421e4af4 100644 --- a/rtengine/rawimage.cc +++ b/rtengine/rawimage.cc @@ -15,6 +15,7 @@ #include "settings.h" #include "camconst.h" #include "utils.h" +#include "rtengine.h" namespace rtengine { diff --git a/rtengine/rawimage.h b/rtengine/rawimage.h index 4537fdcab..09aaed7ad 100644 --- a/rtengine/rawimage.h +++ b/rtengine/rawimage.h @@ -21,6 +21,7 @@ #include #include #include +#include #include "dcraw.h" #include "imageformat.h" diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc index 0836a3832..0a36bdee8 100644 --- a/rtengine/rawimagesource.cc +++ b/rtengine/rawimagesource.cc @@ -34,7 +34,6 @@ #include "pdaflinesfilter.h" #include "procparams.h" #include "rawimage.h" -#include "rawimage.h" #include "rawimagesource_i.h" #include "rawimagesource.h" #include "rt_math.h" diff --git a/rtengine/rcd_demosaic.cc b/rtengine/rcd_demosaic.cc index 48c3ad334..63b5989ab 100644 --- a/rtengine/rcd_demosaic.cc +++ b/rtengine/rcd_demosaic.cc @@ -20,7 +20,6 @@ #include "rawimagesource.h" #include "rt_math.h" -#include "procparams.h" #include "../rtgui/multilangmgr.h" #include "opthelper.h" #include "StopWatch.h" diff --git a/rtengine/vng4_demosaic_RT.cc b/rtengine/vng4_demosaic_RT.cc index aaaa1b9a6..95fa58cef 100644 --- a/rtengine/vng4_demosaic_RT.cc +++ b/rtengine/vng4_demosaic_RT.cc @@ -23,7 +23,6 @@ #include "rtengine.h" #include "rawimage.h" #include "rawimagesource.h" -#include "procparams.h" #include "../rtgui/multilangmgr.h" //#define BENCHMARK #include "StopWatch.h" diff --git a/rtgui/darkframe.cc b/rtgui/darkframe.cc index af7ffeace..74ef1384a 100644 --- a/rtgui/darkframe.cc +++ b/rtgui/darkframe.cc @@ -25,6 +25,7 @@ #include "rtimage.h" #include "../rtengine/procparams.h" +#include "../rtengine/rawimage.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/darkframe.h b/rtgui/darkframe.h index 58ac904ff..7bb6ed507 100644 --- a/rtgui/darkframe.h +++ b/rtgui/darkframe.h @@ -25,8 +25,11 @@ #include "guiutils.h" #include "toolpanel.h" -#include "../rtengine/rawimage.h" +namespace rtengine { +class RawImage; + +} class DFProvider { public: diff --git a/rtgui/flatfield.cc b/rtgui/flatfield.cc index 03204c037..932ec641c 100644 --- a/rtgui/flatfield.cc +++ b/rtgui/flatfield.cc @@ -25,6 +25,7 @@ #include "rtimage.h" #include "../rtengine/procparams.h" +#include "../rtengine/rawimage.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/flatfield.h b/rtgui/flatfield.h index 02cc9963f..8b04a7948 100644 --- a/rtgui/flatfield.h +++ b/rtgui/flatfield.h @@ -26,8 +26,11 @@ #include "guiutils.h" #include "toolpanel.h" -#include "../rtengine/rawimage.h" +namespace rtengine { +class RawImage; + +} class FFProvider { public: