From ffefa470d89f4e7efb2baab8a91123448857ec4a Mon Sep 17 00:00:00 2001 From: Oliver Duis Date: Mon, 14 Nov 2011 21:33:25 +0100 Subject: [PATCH] Compiler warning cleanup on behalf of artiiP; see issue 1106 --- rtengine/alignedbuffer.h | 2 -- rtengine/dcrop.cc | 2 +- rtengine/demosaic_algos.cc | 2 +- rtengine/dfmanager.cc | 2 +- rtengine/ffmanager.cc | 2 +- rtengine/imageio.cc | 2 +- rtengine/imageio.h | 2 +- rtengine/improccoordinator.cc | 2 +- rtengine/ipsharpen.cc | 2 +- rtengine/rawimage.cc | 2 +- 10 files changed, 9 insertions(+), 11 deletions(-) diff --git a/rtengine/alignedbuffer.h b/rtengine/alignedbuffer.h index f16a87ded..430b0659b 100644 --- a/rtengine/alignedbuffer.h +++ b/rtengine/alignedbuffer.h @@ -20,8 +20,6 @@ #define _ALIGNEDBUFFER_ #include -#include - template class AlignedBuffer { private: diff --git a/rtengine/dcrop.cc b/rtengine/dcrop.cc index a99f5bf76..932f5b920 100644 --- a/rtengine/dcrop.cc +++ b/rtengine/dcrop.cc @@ -26,7 +26,7 @@ namespace rtengine { -extern Settings* settings; +extern const Settings* settings; Crop::Crop (ImProcCoordinator* parent) : resizeCrop(NULL), transCrop(NULL), updating(false), diff --git a/rtengine/demosaic_algos.cc b/rtengine/demosaic_algos.cc index a9961dace..dc027a8b2 100644 --- a/rtengine/demosaic_algos.cc +++ b/rtengine/demosaic_algos.cc @@ -47,7 +47,7 @@ namespace rtengine { #define CLIREF(x) LIM(x,-200000.0,200000.0) // avoid overflow : do not act directly on image[] or pix[] #define PIX_SORT(a,b) { if ((a)>(b)) {temp=(a);(a)=(b);(b)=temp;} } -extern Settings* settings; +extern const Settings* settings; //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% void RawImageSource::eahd_demosaic () { diff --git a/rtengine/dfmanager.cc b/rtengine/dfmanager.cc index 80b0f8b9c..3b9882f4f 100644 --- a/rtengine/dfmanager.cc +++ b/rtengine/dfmanager.cc @@ -29,7 +29,7 @@ namespace rtengine{ -extern Settings* settings; +extern const Settings* settings; // *********************** class dfInfo ************************************** diff --git a/rtengine/ffmanager.cc b/rtengine/ffmanager.cc index a9454167d..d59f6117f 100644 --- a/rtengine/ffmanager.cc +++ b/rtengine/ffmanager.cc @@ -28,7 +28,7 @@ namespace rtengine{ -extern Settings* settings; +extern const Settings* settings; // *********************** class ffInfo ************************************** diff --git a/rtengine/imageio.cc b/rtengine/imageio.cc index 943826288..172bcbe61 100644 --- a/rtengine/imageio.cc +++ b/rtengine/imageio.cc @@ -524,7 +524,7 @@ int ImageIO::loadPPMFromMemory(const char* buffer, int width, int height, bool s return IMIO_SUCCESS; } -int ImageIO::savePNG (Glib::ustring fname, int compression, int bps) { +int ImageIO::savePNG (Glib::ustring fname, int compression, volatile int bps) { FILE *file = safe_g_fopen_WriteBinLock (fname); diff --git a/rtengine/imageio.h b/rtengine/imageio.h index 09490c3f5..9d2a509ec 100644 --- a/rtengine/imageio.h +++ b/rtengine/imageio.h @@ -75,7 +75,7 @@ class ImageIO { int loadJPEGFromMemory (const char* buffer, int bufsize); int loadPPMFromMemory(const char* buffer,int width,int height, bool swap, int bps); - int savePNG (Glib::ustring fname, int compression = -1, int bps = -1); + int savePNG (Glib::ustring fname, int compression = -1, volatile int bps = -1); int saveJPEG (Glib::ustring fname, int quality = 100); int saveTIFF (Glib::ustring fname, int bps = -1, bool uncompressed = false); diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc index b3247a811..2f3b2f1cb 100644 --- a/rtengine/improccoordinator.cc +++ b/rtengine/improccoordinator.cc @@ -26,7 +26,7 @@ namespace rtengine { -extern Settings* settings; +extern const Settings* settings; ImProcCoordinator::ImProcCoordinator () : awbComputed(false), ipf(¶ms, true), scale(10), allocated(false), diff --git a/rtengine/ipsharpen.cc b/rtengine/ipsharpen.cc index 9fb2a7e74..706dab598 100644 --- a/rtengine/ipsharpen.cc +++ b/rtengine/ipsharpen.cc @@ -38,7 +38,7 @@ namespace rtengine { #define CLIREF(x) LIM(x,-200000.0,200000.0) // avoid overflow : do not act directly on image[] or pix[] -extern Settings* settings; +extern const Settings* settings; void ImProcFunctions::dcdamping (float** aI, float** aO, float damping, int W, int H) { diff --git a/rtengine/rawimage.cc b/rtengine/rawimage.cc index 24c8eae6c..125cd9817 100644 --- a/rtengine/rawimage.cc +++ b/rtengine/rawimage.cc @@ -17,7 +17,7 @@ namespace rtengine{ -extern Settings* settings; +extern const Settings* settings; RawImage::RawImage( const Glib::ustring name ) :allocation(NULL)