liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Further cleanup of include dependencies

Browse Source
This commit is contained in:
Ingo Weyrich 2019-10-29 21:06:27 +01:00
parent ed161c6288
commit 068847eb5a
57 changed files with 70 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rtengine/CMakeLists.txt
View File

@ -121,7 +121,6 @@ set(RTENGINESOURCEFILES
rtthumbnail.cc rtthumbnail.cc
shmap.cc shmap.cc
simpleprocess.cc simpleprocess.cc
slicer.cc
stdimagesource.cc stdimagesource.cc
tmo_fattal02.cc tmo_fattal02.cc
utils.cc utils.cc

21
rtengine/LUT.h
View File

@ -64,7 +64,6 @@
#include <cassert> #include <cassert>
#ifndef NDEBUG #ifndef NDEBUG
#include <glibmm.h>
#include <fstream> #include <fstream>
#endif #endif
@ -485,26 +484,6 @@ public:
return (p1 + p2 * diff); return (p1 + p2 * diff);
} }
#ifndef NDEBUG
// Debug facility ; dump the content of the LUT in a file. No control of the filename is done
void dump(Glib::ustring fname)
{
if (size) {
Glib::ustring fname_ = fname + ".xyz"; // TopSolid'Design "plot" file format
std::ofstream f (fname_.c_str());
f << "$" << std::endl;
for (unsigned int iter = 0; iter < size; iter++) {
f << iter << ", " << data[iter] << ", 0." << std::endl;
}
f << "$" << std::endl;
f.close ();
}
}
#endif
operator bool (void) const operator bool (void) const
{ {
return size > 0; return size > 0;

1
rtengine/bilateral2.h
View File

@ -22,7 +22,6 @@
#include <cmath> #include <cmath>
#include <cstring> #include <cstring>
#include <cstdio> #include <cstdio>
#include <glibmm.h>
#include "rtengine.h" #include "rtengine.h"
#include "rt_math.h" #include "rt_math.h"

3
rtengine/camconst.cc
View File

@ -2,6 +2,9 @@
* This file is part of RawTherapee. * This file is part of RawTherapee.
*/ */
#include "camconst.h" #include "camconst.h"
#include <glibmm/fileutils.h>
#include <glibmm/miscutils.h>
#include <glibmm/ustring.h>
#include "settings.h" #include "settings.h"
#include "rt_math.h" #include "rt_math.h"
#include <cstdio> #include <cstdio>

3
rtengine/camconst.h
View File

@ -4,8 +4,9 @@
#ifndef __CAMCONST__ #ifndef __CAMCONST__
#define __CAMCONST__ #define __CAMCONST__
#include <glibmm.h> #include <glibmm/ustring.h>
#include <map> #include <map>
#include <vector>
namespace rtengine namespace rtengine
{ {

2
rtengine/clutstore.h
View File

@ -3,8 +3,6 @@
#include <memory> #include <memory>
#include <cstdint> #include <cstdint>
#include <gtkmm.h>
#include "cache.h" #include "cache.h"
#include "alignedbuffer.h" #include "alignedbuffer.h"
#include "noncopyable.h" #include "noncopyable.h"

2
rtengine/color.h
View File

@ -20,7 +20,7 @@
#pragma once #pragma once
#include <array> #include <array>
#include <glibmm.h> #include <glibmm/ustring.h>
#include "rt_math.h" #include "rt_math.h"
#include "LUT.h" #include "LUT.h"

2
rtengine/curves.h
View File

@ -22,7 +22,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <glibmm.h> #include <glibmm/ustring.h>
#include "rt_math.h" #include "rt_math.h"
#include "../rtgui/mycurve.h" #include "../rtgui/mycurve.h"

2
rtengine/dcp.h
View File

@ -24,7 +24,7 @@
#include <array> #include <array>
#include <memory> #include <memory>
#include <glibmm.h> #include <glibmm/ustring.h>
#include "../rtgui/threadutils.h" #include "../rtgui/threadutils.h"

1
rtengine/dfmanager.cc
View File

@ -19,7 +19,6 @@
#include "dfmanager.h" #include "dfmanager.h"
#include "../rtgui/options.h" #include "../rtgui/options.h"
#include <giomm.h> #include <giomm.h>
#include "../rtgui/guiutils.h"
#include "rawimage.h" #include "rawimage.h"
#include <sstream> #include <sstream>
#include <iostream> #include <iostream>

3
rtengine/dynamicprofile.cc
View File

@ -17,10 +17,11 @@
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>. * along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include "../rtengine/dynamicprofile.h" #include "dynamicprofile.h"
#include <stdlib.h> #include <stdlib.h>
#include <glibmm/regex.h> #include <glibmm/regex.h>
#include <glibmm/miscutils.h>
using namespace rtengine; using namespace rtengine;
using namespace rtengine::procparams; using namespace rtengine::procparams;

2
rtengine/dynamicprofile.h
View File

@ -19,7 +19,7 @@
#ifndef _DYNAMICPROFILE_H_ #ifndef _DYNAMICPROFILE_H_
#define _DYNAMICPROFILE_H_ #define _DYNAMICPROFILE_H_
#include <glibmm.h> #include <glibmm/ustring.h>
#include <vector> #include <vector>
#include "../rtgui/options.h" #include "../rtgui/options.h"

4
rtengine/ffmanager.cc
View File

@ -16,6 +16,10 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>. * along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include <giomm/file.h>
#include <glibmm/miscutils.h>
#include "ffmanager.h" #include "ffmanager.h"
#include "../rtgui/options.h" #include "../rtgui/options.h"
#include "rawimage.h" #include "rawimage.h"

4
rtengine/iccstore.cc
View File

@ -18,7 +18,9 @@
*/ */
#include <cstring> #include <cstring>
#include <glibmm.h> #include <glibmm/ustring.h>
#include <glibmm/fileutils.h>
#include <glibmm/miscutils.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
#ifdef WIN32 #ifdef WIN32

3
rtengine/iccstore.h
View File

@ -19,10 +19,11 @@
#pragma once #pragma once
#include <cstdint> #include <cstdint>
#include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include <glibmm.h> #include <glibmm/ustring.h>
#include <lcms2.h> #include <lcms2.h>

2
rtengine/iimage.h
View File

@ -19,7 +19,7 @@
#ifndef _IIMAGE_ #ifndef _IIMAGE_
#define _IIMAGE_ #define _IIMAGE_
#include <glibmm.h> #include <glibmm/ustring.h>
#include <vector> #include <vector>
#include "rt_math.h" #include "rt_math.h"
#include "alignedbuffer.h" #include "alignedbuffer.h"

2
rtengine/imagedata.h
View File

@ -22,7 +22,7 @@
#include <cstdio> #include <cstdio>
#include <memory> #include <memory>
#include <string> #include <string>
#include <glibmm.h> #include <glibmm/ustring.h>
#include "../rtexif/rtexif.h" #include "../rtexif/rtexif.h"
#include <libiptcdata/iptc-data.h> #include <libiptcdata/iptc-data.h>
#include "rtengine.h" #include "rtengine.h"

2
rtengine/imageio.h
View File

@ -30,7 +30,7 @@
#include <memory> #include <memory>
#include <glibmm.h> #include <glibmm/ustring.h>
#include <libiptcdata/iptc-data.h> #include <libiptcdata/iptc-data.h>
#include "rtengine.h" #include "rtengine.h"
#include "imageformat.h" #include "imageformat.h"

2
rtengine/imagesource.h
View File

@ -21,7 +21,7 @@
#include <array> #include <array>
#include <vector> #include <vector>
#include <glibmm.h> #include <glibmm/ustring.h>
#include "coord2d.h" #include "coord2d.h"
#include "dcp.h" #include "dcp.h"

3
rtengine/improcfun.cc
View File

@ -18,7 +18,7 @@
*/ */
#include <cmath> #include <cmath>
#include <glib.h> #include <glib.h>
#include <glibmm.h> #include <glibmm/ustring.h>
#ifdef _OPENMP #ifdef _OPENMP
#include <omp.h> #include <omp.h>
#endif #endif
@ -46,7 +46,6 @@
#include "StopWatch.h" #include "StopWatch.h"
#include "procparams.h" #include "procparams.h"
#include "../rtgui/ppversion.h" #include "../rtgui/ppversion.h"
#include "../rtgui/guiutils.h"
#include "../rtgui/editcallbacks.h" #include "../rtgui/editcallbacks.h"
#undef CLIPD #undef CLIPD

2
rtengine/iplab2rgb.cc
View File

@ -21,7 +21,7 @@
#include "imagefloat.h" #include "imagefloat.h"
#include "labimage.h" #include "labimage.h"
#include "improcfun.h" #include "improcfun.h"
#include <glibmm.h> #include <glibmm/ustring.h>
#include "iccstore.h" #include "iccstore.h"
#include "iccmatrices.h" #include "iccmatrices.h"
#include "../rtgui/options.h" #include "../rtgui/options.h"

2
rtengine/lcp.cc
View File

@ -20,6 +20,8 @@
#include <algorithm> #include <algorithm>
#include <cstring> #include <cstring>
#include <glibmm/ustring.h>
#include <glibmm/fileutils.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
#ifdef WIN32 #ifdef WIN32

2
rtengine/lcp.h
View File

@ -25,7 +25,7 @@
#include <string> #include <string>
#include <sstream> #include <sstream>
#include <glibmm.h> #include <glibmm/ustring.h>
#include <expat.h> #include <expat.h>
#include "cache.h" #include "cache.h"

1
rtengine/myfile.cc
View File

@ -18,7 +18,6 @@
*/ */
#include "myfile.h" #include "myfile.h"
#include <cstdarg> #include <cstdarg>
#include <glibmm.h>
// get mmap() sorted out // get mmap() sorted out
#ifdef MYFILE_MMAP #ifdef MYFILE_MMAP

2
rtengine/previewimage.h
View File

@ -19,7 +19,7 @@
#ifndef _PREVIEWIMAGE_ #ifndef _PREVIEWIMAGE_
#define _PREVIEWIMAGE_ #define _PREVIEWIMAGE_
#include <gtkmm.h> #include <glibmm/ustring.h>
#include <cairomm/cairomm.h> #include <cairomm/cairomm.h>
namespace rtengine namespace rtengine

3
rtengine/procparams.h
View File

@ -23,7 +23,8 @@
#include <type_traits> #include <type_traits>
#include <vector> #include <vector>
#include <glibmm.h> #include <glibmm/ustring.h>
#include <glibmm/keyfile.h>
#include <lcms2.h> #include <lcms2.h>
#include "noncopyable.h" #include "noncopyable.h"

4
rtengine/profilestore.cc
View File

@ -16,6 +16,10 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>. * along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include <glibmm/fileutils.h>
#include <glibmm/miscutils.h>
#include "profilestore.h" #include "profilestore.h"
#include "dynamicprofile.h" #include "dynamicprofile.h"

2
rtengine/profilestore.h
View File

@ -21,7 +21,7 @@
#include <map> #include <map>
#include <vector> #include <vector>
#include <glibmm.h> #include <glibmm/ustring.h>
#include "rtengine.h" #include "rtengine.h"
#include "noncopyable.h" #include "noncopyable.h"

2
rtengine/rtengine.h
View File

@ -22,7 +22,7 @@
#include <ctime> #include <ctime>
#include <string> #include <string>
#include <glibmm.h> #include <glibmm/ustring.h>
#include <lcms2.h> #include <lcms2.h>

2
rtengine/rtlensfun.h
View File

@ -23,7 +23,7 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
#include <glibmm.h> #include <glibmm/ustring.h>
#include <lensfun.h> #include <lensfun.h>

2
rtengine/rtthumbnail.cc
View File

@ -24,7 +24,7 @@
#include "image8.h" #include "image8.h"
#include <lcms2.h> #include <lcms2.h>
#include "curves.h" #include "curves.h"
#include <glibmm.h> #include <glibmm/ustring.h>
#include "improcfun.h" #include "improcfun.h"
#include "colortemp.h" #include "colortemp.h"
#include "mytime.h" #include "mytime.h"

2
rtengine/rtthumbnail.h
View File

@ -20,7 +20,7 @@
#define _THUMBPROCESSINGPARAMETERS_ #define _THUMBPROCESSINGPARAMETERS_
#include "rawmetadatalocation.h" #include "rawmetadatalocation.h"
#include <glibmm.h> #include <glibmm/ustring.h>
#include <lcms2.h> #include <lcms2.h>
#include "image8.h" #include "image8.h"
#include "image16.h" #include "image16.h"

2
rtengine/simpleprocess.cc
View File

@ -28,7 +28,7 @@
#include "clutstore.h" #include "clutstore.h"
#include "processingjob.h" #include "processingjob.h"
#include "procparams.h" #include "procparams.h"
#include <glibmm.h> #include <glibmm/ustring.h>
#include "../rtgui/options.h" #include "../rtgui/options.h"
#include "rawimagesource.h" #include "rawimagesource.h"
#include "../rtgui/multilangmgr.h" #include "../rtgui/multilangmgr.h"

3
rtexif/rtexif.h
View File

@ -30,7 +30,8 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <glibmm.h> #include <glibmm/keyfile.h>
#include <glibmm/ustring.h>
#include "../rtengine/noncopyable.h" #include "../rtengine/noncopyable.h"
#include "../rtengine/rawmetadatalocation.h" #include "../rtengine/rawmetadatalocation.h"

2
rtgui/batchqueue.cc
View File

@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>. * along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include <glibmm.h> #include <glibmm/ustring.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <cstring> #include <cstring>
#include <functional> #include <functional>

3
rtgui/bqentryupdater.h
View File

@ -19,7 +19,8 @@
#ifndef _BQENTRYUPDATER_ #ifndef _BQENTRYUPDATER_
#define _BQENTRYUPDATER_ #define _BQENTRYUPDATER_
#include <glibmm.h> #include <glibmm/thread.h>
#include "../rtengine/rtengine.h" #include "../rtengine/rtengine.h"
#include "threadutils.h" #include "threadutils.h"
#include "thumbnail.h" #include "thumbnail.h"

3
rtgui/browserfilter.h
View File

@ -19,8 +19,9 @@
#ifndef _BROWSERFILTER_ #ifndef _BROWSERFILTER_
#define _BROWSERFILTER_ #define _BROWSERFILTER_
#include <vector>
#include "exiffiltersettings.h" #include "exiffiltersettings.h"
#include <glibmm.h>
class BrowserFilter class BrowserFilter
{ {

2
rtgui/cacheimagedata.h
View File

@ -19,7 +19,7 @@
#ifndef _CACHEIMAGEDATA_ #ifndef _CACHEIMAGEDATA_
#define _CACHEIMAGEDATA_ #define _CACHEIMAGEDATA_
#include <glibmm.h> #include <glibmm/ustring.h>
#include "options.h" #include "options.h"
#include "../rtengine/rtengine.h" #include "../rtengine/rtengine.h"
#include "../rtengine/imageformat.h" #include "../rtengine/imageformat.h"

2
rtgui/extprog.cc
View File

@ -26,6 +26,8 @@
#include <shlobj.h> #include <shlobj.h>
#endif #endif
#include <gtkmm.h>
#include "options.h" #include "options.h"
#include "multilangmgr.h" #include "multilangmgr.h"

2
rtgui/filebrowser.cc
View File

@ -21,7 +21,7 @@
#include <algorithm> #include <algorithm>
#include <map> #include <map>
#include <glibmm.h> #include <glibmm/ustring.h>
#include "filebrowser.h" #include "filebrowser.h"

2
rtgui/filmsimulation.h
View File

@ -2,7 +2,7 @@
#define FILM_SIMULATION_INCLUDED #define FILM_SIMULATION_INCLUDED
#include <gtkmm.h> #include <gtkmm.h>
#include <glibmm.h> #include <glibmm/ustring.h>
#include <memory> #include <memory>
#include "toolpanel.h" #include "toolpanel.h"
#include "guiutils.h" #include "guiutils.h"

2
rtgui/histogrampanel.h
View File

@ -21,7 +21,7 @@
#include <gtkmm.h> #include <gtkmm.h>
#include <glibmm.h> #include <glibmm/ustring.h>
#include <cairomm/cairomm.h> #include <cairomm/cairomm.h>
#include "../rtengine/LUT.h" #include "../rtengine/LUT.h"
#include "../rtengine/improccoordinator.h" #include "../rtengine/improccoordinator.h"

3
rtgui/lensprofile.cc
View File

@ -18,9 +18,10 @@
*/ */
#include <map> #include <map>
#include <set> #include <set>
#include <iostream>
#include <sstream> #include <sstream>
#include <glibmm.h> #include <glibmm/ustring.h>
#include "lensprofile.h" #include "lensprofile.h"

1
rtgui/mycurve.h
View File

@ -26,7 +26,6 @@
#include "coloredbar.h" #include "coloredbar.h"
#include "coordinateadjuster.h" #include "coordinateadjuster.h"
#include "../rtengine/LUT.h" #include "../rtengine/LUT.h"
#include "guiutils.h"
#include "options.h" #include "options.h"
#include "../rtengine/noncopyable.h" #include "../rtengine/noncopyable.h"

1
rtgui/options.cc
View File

@ -19,6 +19,7 @@
#include "options.h" #include "options.h"
#include <cstdio> #include <cstdio>
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <iostream>
#include <sstream> #include <sstream>
#include "multilangmgr.h" #include "multilangmgr.h"
#include "addsetids.h" #include "addsetids.h"

2
rtgui/options.h
View File

@ -20,7 +20,7 @@
#define _OPTIONS_ #define _OPTIONS_
#include <set> #include <set>
#include <gtkmm.h> #include <gtkmm/enums.h>
#include "../rtengine/rtengine.h" #include "../rtengine/rtengine.h"
#include <exception> #include <exception>

2
rtgui/pathutils.cc
View File

@ -16,6 +16,8 @@
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>. * along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include <glibmm/miscutils.h>
#include "pathutils.h" #include "pathutils.h"

14
rtgui/pathutils.h
View File

@ -16,19 +16,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>. * along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
*/ */
#ifndef __PATH_UTILS_ #pragma once
#define __PATH_UTILS_ #include <glibmm/ustring.h>
#include <gtkmm.h>
#include <cairomm/cairomm.h>
#include "../rtengine/rtengine.h"
#include "../rtengine/coord.h"
#include "rtimage.h"
#include <sstream>
#include <iostream>
// Removed from guiutils because used by rawtherapee-cli // Removed from guiutils because used by rawtherapee-cli
Glib::ustring removeExtension (const Glib::ustring& filename); Glib::ustring removeExtension (const Glib::ustring& filename);
Glib::ustring getExtension (const Glib::ustring& filename); Glib::ustring getExtension (const Glib::ustring& filename);
#endif

2
rtgui/pparamschangelistener.h
View File

@ -20,7 +20,7 @@
#define _PPARAMSCHANGELISTENER_ #define _PPARAMSCHANGELISTENER_
#include "../rtengine/rtengine.h" #include "../rtengine/rtengine.h"
#include <glibmm.h> #include <glibmm/ustring.h>
#include "paramsedited.h" #include "paramsedited.h"
class PParamsChangeListener class PParamsChangeListener

2
rtgui/previewloader.h
View File

@ -20,7 +20,7 @@
#define _PREVIEWLOADER_ #define _PREVIEWLOADER_
#include <set> #include <set>
#include <glibmm.h> #include <glibmm/ustring.h>
#include "../rtengine/noncopyable.h" #include "../rtengine/noncopyable.h"

2
rtgui/profilestorecombobox.h
View File

@ -21,7 +21,7 @@
#include <map> #include <map>
#include <vector> #include <vector>
#include <glibmm.h> #include <glibmm/ustring.h>
#include "../rtengine/rtengine.h" #include "../rtengine/rtengine.h"
#include "../rtengine/profilestore.h" #include "../rtengine/profilestore.h"

2
rtgui/rtscalable.cc
View File

@ -20,7 +20,7 @@
#include "rtscalable.h" #include "rtscalable.h"
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <regex> #include <regex>
#include <glibmm.h> #include <gtkmm.h>
#include <iostream> #include <iostream>
#include <librsvg/rsvg.h> #include <librsvg/rsvg.h>
#include "options.h" #include "options.h"

2
rtgui/thumbbrowserbase.cc
View File

@ -16,7 +16,7 @@
*/ */
#include <numeric> #include <numeric>
#include <glibmm.h> #include <glibmm/ustring.h>
#include "multilangmgr.h" #include "multilangmgr.h"
#include "options.h" #include "options.h"

1
rtgui/thumbimageupdater.h
View File

@ -19,7 +19,6 @@
#ifndef _THUMBIMAGEUPDATER_ #ifndef _THUMBIMAGEUPDATER_
#define _THUMBIMAGEUPDATER_ #define _THUMBIMAGEUPDATER_
#include <glibmm.h>
#include <glib.h> #include <glib.h>
#include "../rtengine/rtengine.h" #include "../rtengine/rtengine.h"

1
rtgui/thumbnail.cc
View File

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

2
rtgui/thumbnail.h
View File

@ -22,7 +22,7 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include <glibmm.h> #include <glibmm/ustring.h>
#include "cachemanager.h" #include "cachemanager.h"
#include "options.h" #include "options.h"
#include "../rtengine/rtengine.h" #include "../rtengine/rtengine.h"

2
rtgui/toolpanel.h
View File

@ -20,7 +20,7 @@
#define __TOOLPANEL__ #define __TOOLPANEL__
#include <gtkmm.h> #include <gtkmm.h>
#include <glibmm.h> #include <glibmm/ustring.h>
#include "../rtengine/rtengine.h" #include "../rtengine/rtengine.h"
#include "editbuffer.h" #include "editbuffer.h"
#include "guiutils.h" #include "guiutils.h"