From 05226a287572d8b19d83ea6ba3d58a68c5db9f8b Mon Sep 17 00:00:00 2001 From: Oliver Duis Date: Sun, 6 May 2012 23:04:47 +0200 Subject: [PATCH] Backed out changeset: 159f9e7014f8 --- rtengine/EdgePreservingDecomposition.cc | 4 +- rtengine/EdgePreservingDecomposition.h | 6 +- rtengine/LUT.h | 6 +- rtengine/alignedbuffer.h | 2 +- rtengine/array2D.h | 10 +- rtengine/cfa_linedn_RT.cc | 2 +- rtengine/colortemp.h | 8 +- rtengine/dcp.cc | 4 +- rtengine/dcrop.cc | 2 +- rtengine/dcrop.h | 4 +- rtengine/demosaic_algos.cc | 6 +- rtengine/dfmanager.cc | 23 +- rtengine/dfmanager.h | 2 +- rtengine/diagonalcurves.cc | 2 +- rtengine/ffmanager.cc | 16 +- rtengine/ffmanager.h | 2 +- rtengine/flatcurves.cc | 10 +- rtengine/gamutbdy.cc | 2 +- rtengine/gauss.h | 4 +- rtengine/iccstore.cc | 18 +- rtengine/iccstore.h | 6 +- rtengine/imagedata.cc | 4 +- rtengine/imageio.cc | 10 +- rtengine/imageio.h | 4 +- rtengine/improccoordinator.cc | 2 +- rtengine/improcfun.cc | 4 +- rtengine/improcfun.h | 18 +- rtengine/ipsharpen.cc | 14 +- rtengine/iptransform.cc | 12 +- rtengine/ipvibrance.cc | 4 +- rtengine/klt/klt.cc | 4 +- rtengine/klt/pyramid.cc | 2 +- rtengine/klt/trackFeatures.cc | 2 +- rtengine/mytime.h | 2 +- rtengine/procparams.cc | 364 ++++++++++++------------ rtengine/procparams.h | 4 +- rtengine/rawimage.h | 18 +- rtengine/rawimagesource.cc | 10 +- rtengine/rawimagesource.h | 18 +- rtengine/rawimagesource_i.h | 6 +- rtengine/rtthumbnail.cc | 6 +- rtengine/rtthumbnail.h | 6 +- rtengine/safegtk.cc | 4 +- rtengine/simpleprocess.cc | 4 +- rtengine/slicer.cc | 2 +- rtengine/slicer.h | 2 +- rtengine/stdimagesource.cc | 10 +- rtengine/stdimagesource.h | 6 +- rtexif/nikonattribs.cc | 24 +- rtexif/olympusattribs.cc | 2 +- rtexif/pentaxattribs.cc | 12 +- rtexif/rtexif.cc | 10 +- rtexif/rtexif.h | 10 +- rtgui/batchqueue.cc | 26 +- rtgui/batchqueuepanel.cc | 2 +- rtgui/batchtoolpanelcoord.cc | 8 +- rtgui/bqentryupdater.cc | 4 +- rtgui/cachemanager.cc | 20 +- rtgui/clipboard.h | 16 +- rtgui/crop.cc | 12 +- rtgui/crophandler.cc | 8 +- rtgui/crophandler.h | 8 +- rtgui/cropwindow.cc | 40 +-- rtgui/cropwindow.h | 18 +- rtgui/curveeditorgroup.cc | 8 +- rtgui/curveeditorgroup.h | 6 +- rtgui/curvelistener.h | 2 +- rtgui/diagonalcurveeditorsubgroup.cc | 10 +- rtgui/dirbrowser.cc | 26 +- rtgui/editorpanel.cc | 6 +- rtgui/editwindow.cc | 6 +- rtgui/exifpanel.cc | 26 +- rtgui/extprog.cc | 10 +- rtgui/favoritbrowser.cc | 8 +- rtgui/filebrowser.cc | 30 +- rtgui/filebrowserentry.cc | 2 +- rtgui/filebrowserentry.h | 2 +- rtgui/filecatalog.cc | 26 +- rtgui/filepanel.cc | 6 +- rtgui/filterpanel.cc | 16 +- rtgui/flatcurveeditorsubgroup.cc | 10 +- rtgui/guiutils.cc | 4 +- rtgui/histogrampanel.cc | 6 +- rtgui/history.cc | 24 +- rtgui/icmpanel.cc | 6 +- rtgui/imagearea.cc | 18 +- rtgui/iptcpanel.cc | 30 +- rtgui/lwbutton.cc | 12 +- rtgui/lwbutton.h | 12 +- rtgui/lwbuttonset.cc | 6 +- rtgui/lwbuttonset.h | 4 +- rtgui/main.cc | 4 +- rtgui/multilangmgr.cc | 8 +- rtgui/multilangmgr.h | 2 +- rtgui/mydiagonalcurve.cc | 30 +- rtgui/myflatcurve.cc | 26 +- rtgui/options.cc | 12 +- rtgui/paramsedited.cc | 4 +- rtgui/placesbrowser.cc | 6 +- rtgui/popupcommon.cc | 14 +- rtgui/popupcommon.h | 4 +- rtgui/preferences.cc | 12 +- rtgui/previewhandler.cc | 2 +- rtgui/previewhandler.h | 2 +- rtgui/previewloader.cc | 2 +- rtgui/profilepanel.cc | 8 +- rtgui/profilestore.cc | 10 +- rtgui/progressconnector.h | 4 +- rtgui/recentbrowser.cc | 2 +- rtgui/renamedlg.cc | 8 +- rtgui/rtimage.cc | 10 +- rtgui/rtwindow.cc | 2 +- rtgui/saveasdlg.cc | 4 +- rtgui/shcselector.h | 2 +- rtgui/thumbbrowserbase.cc | 2 +- rtgui/thumbbrowserentry.cc | 2 +- rtgui/thumbbrowserentrybase.cc | 12 +- rtgui/thumbbrowserentrybase.h | 8 +- rtgui/thumbnail.cc | 18 +- rtgui/thumbnail.h | 30 +- rtgui/toolbar.cc | 2 +- rtgui/toolpanelcoord.cc | 6 +- rtgui/toolpanelcoord.h | 2 +- rtgui/whitebalance.cc | 10 +- rtgui/windirmonitor.cc | 4 +- 125 files changed, 747 insertions(+), 750 deletions(-) diff --git a/rtengine/EdgePreservingDecomposition.cc b/rtengine/EdgePreservingDecomposition.cc index fae9612b6..72bdc9820 100644 --- a/rtengine/EdgePreservingDecomposition.cc +++ b/rtengine/EdgePreservingDecomposition.cc @@ -126,7 +126,7 @@ bool MultiDiagonalSymmetricMatrix::CreateDiagonal(unsigned int index, unsigned i return true; } -int MultiDiagonalSymmetricMatrix::FindIndex(unsigned int StartRow) const { +int MultiDiagonalSymmetricMatrix::FindIndex(unsigned int StartRow){ //There's GOT to be a better way to do this. "Bidirectional map?" for(unsigned int i = 0; i != m; i++) if(StartRows[i] == StartRow) @@ -274,7 +274,7 @@ void MultiDiagonalSymmetricMatrix::KillIncompleteCholeskyFactorization(void){ delete IncompleteCholeskyFactorization; } -void MultiDiagonalSymmetricMatrix::CholeskyBackSolve(float *x, float *b) const { +void MultiDiagonalSymmetricMatrix::CholeskyBackSolve(float *x, float *b){ //We want to solve L D Lt x = b where D is a diagonal matrix described by Diagonals[0] and L is a unit lower triagular matrix described by the rest of the diagonals. //Let D Lt x = y. Then, first solve L y = b. float *y = new float[n]; diff --git a/rtengine/EdgePreservingDecomposition.h b/rtengine/EdgePreservingDecomposition.h index 4164f4248..b3b832823 100644 --- a/rtengine/EdgePreservingDecomposition.h +++ b/rtengine/EdgePreservingDecomposition.h @@ -73,7 +73,7 @@ public: unsigned int *StartRows; bool CreateDiagonal(unsigned int index, unsigned int StartRow); unsigned int n, m; //The matrix is n x n, with m diagonals on the lower triangle. Don't change these. They should be private but aren't for convenience. - inline unsigned int DiagonalLength(unsigned int StartRow) const { //Gives number of elements in a diagonal. + inline unsigned int DiagonalLength(unsigned int StartRow){ //Gives number of elements in a diagonal. return n - StartRow; }; @@ -84,7 +84,7 @@ public: void VectorProduct(float *Product, float *x); //Given the start row, attempts to find the corresponding index, or -1 if the StartRow doesn't exist. - int FindIndex(unsigned int StartRow) const; + int FindIndex(unsigned int StartRow); //This is the same as above, but designed to take this class as a pass through variable. By this way you can feed //the meat of this class into an independent function, such as SparseConjugateGradient. @@ -98,7 +98,7 @@ public: Note that VectorProduct is nonsense. More useful to you is CholeskyBackSolve which fills x, where LDLt x = b. */ bool CreateIncompleteCholeskyFactorization(unsigned int MaxFillAbove = 0); void KillIncompleteCholeskyFactorization(void); - void CholeskyBackSolve(float *x, float *b) const; + void CholeskyBackSolve(float *x, float *b); MultiDiagonalSymmetricMatrix *IncompleteCholeskyFactorization; static void PassThroughCholeskyBackSolve(float *Product, float *x, void *Pass){ diff --git a/rtengine/LUT.h b/rtengine/LUT.h index 85b583709..ad43ab471 100644 --- a/rtengine/LUT.h +++ b/rtengine/LUT.h @@ -132,7 +132,7 @@ public: return *this; } // use with integer indices - T& operator[](int index) const { + T& operator[](int index) { if (((unsigned int)index) maxs) { if (idx<0) @@ -166,7 +166,7 @@ public: return (p1 + p2*diff); } - operator bool (void) const + operator bool (void) { return size>0; } diff --git a/rtengine/alignedbuffer.h b/rtengine/alignedbuffer.h index f49e00e2b..430b0659b 100644 --- a/rtengine/alignedbuffer.h +++ b/rtengine/alignedbuffer.h @@ -30,7 +30,7 @@ template class AlignedBuffer { AlignedBuffer (size_t size, size_t align=16) { real = new T[size+2*align]; - data = reinterpret_cast((uintptr_t)real + (align-((uintptr_t)real)%align)); + data = (T*)((uintptr_t)real + (align-((uintptr_t)real)%align)); } ~AlignedBuffer () { diff --git a/rtengine/array2D.h b/rtengine/array2D.h index 6970242ed..b80f1d1e8 100644 --- a/rtengine/array2D.h +++ b/rtengine/array2D.h @@ -162,12 +162,12 @@ public: } // use as pointer to T** - operator T**() const { + operator T**() { return ptr; } // use as pointer to data - operator T*() const { + operator T*() { // only if owner this will return a valid pointer return data; } @@ -210,14 +210,14 @@ public: ar_realloc(w,h); memcpy(data, copy, w * h * sizeof(T)); } - int width() const { + int width() { return x; } - int height() const { + int height() { return y; } - operator bool() const { + operator bool() { return (x > 0 && y > 0); } diff --git a/rtengine/cfa_linedn_RT.cc b/rtengine/cfa_linedn_RT.cc index 2b3cd9fb3..1a55f0866 100644 --- a/rtengine/cfa_linedn_RT.cc +++ b/rtengine/cfa_linedn_RT.cc @@ -323,7 +323,7 @@ void RawImageSource::CLASS cfa_linedn(float noise) #define W8_4R 0.70710678118654752440 -void RawImageSource::ddct8x8s(int isgn, float **a) const +void RawImageSource::ddct8x8s(int isgn, float **a) { int j; float x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i; diff --git a/rtengine/colortemp.h b/rtengine/colortemp.h index c30714c43..8059c367f 100644 --- a/rtengine/colortemp.h +++ b/rtengine/colortemp.h @@ -45,8 +45,8 @@ class ColorTemp { ColorTemp (double t, double g, Glib::ustring m); ColorTemp (double mulr, double mulg, double mulb); - inline double getTemp () const { return temp; } - inline double getGreen () const { return green; } + inline double getTemp () { return temp; } + inline double getGreen () { return green; } void getMultipliers (double &mulr, double &mulg, double &mulb) { temp2mul (temp, green, mulr, mulg, mulb); } @@ -54,8 +54,8 @@ class ColorTemp { void temp2mul (double temp, double green, double& rmul, double& gmul, double& bmul); //void temp2mul (double& rmul, double& gmul, double& bmul); - bool operator== (const ColorTemp& other) const { return fabs(temp-other.temp)<1e-10 && fabs(green-other.green)<1e-10; } - bool operator!= (const ColorTemp& other) const { return !(*this==other); } + bool operator== (const ColorTemp& other) { return fabs(temp-other.temp)<1e-10 && fabs(green-other.green)<1e-10; } + bool operator!= (const ColorTemp& other) { return !(*this==other); } static double blackbody_spect (double wavelength, double m1, double m2, double temp); static double daylight_spect (double wavelength, double m1, double m2, double temp); diff --git a/rtengine/dcp.cc b/rtengine/dcp.cc index 0215ae58d..17350126e 100644 --- a/rtengine/dcp.cc +++ b/rtengine/dcp.cc @@ -474,7 +474,7 @@ void DCPStore::init (Glib::ustring rtProfileDir) { Glib::ustring rootDirName=rtProfileDir; - if (!rootDirName.empty()) { + if (rootDirName!="") { std::deque qDirs; qDirs.push_front(rootDirName); @@ -526,7 +526,7 @@ DCPProfile* DCPStore::getStdProfile(Glib::ustring camShortName) { Glib::ustring name2=camShortName.uppercase(); // Warning: do NOT use map.find(), since it does not seem to work reliably here - for (std::map::const_iterator i=fileStdProfiles.begin();i!=fileStdProfiles.end(); ++i) + for (std::map::iterator i=fileStdProfiles.begin();i!=fileStdProfiles.end();i++) if (name2==(*i).first) return getProfile((*i).second); return NULL; diff --git a/rtengine/dcrop.cc b/rtengine/dcrop.cc index e0aba0862..ff7ed811d 100644 --- a/rtengine/dcrop.cc +++ b/rtengine/dcrop.cc @@ -221,7 +221,7 @@ void Crop::update (int todo) { if (cropImageListener) { // this in output space held in parallel to allow analysis like shadow/highlight Glib::ustring outProfile=params.icm.output; - if (params.icm.output.empty() || params.icm.output==ColorManagementParams::NoICMString) outProfile="sRGB"; + if (params.icm.output=="" || params.icm.output==ColorManagementParams::NoICMString) outProfile="sRGB"; Image8 *cropImgtrue = parent->ipf.lab2rgb (labnCrop, 0,0,cropw,croph, outProfile); int finalW = rqcropw; diff --git a/rtengine/dcrop.h b/rtengine/dcrop.h index fa48d1512..5647d91a2 100644 --- a/rtengine/dcrop.h +++ b/rtengine/dcrop.h @@ -65,7 +65,7 @@ class Crop : public DetailedCrop { Crop (ImProcCoordinator* parent); virtual ~Crop (); - bool hasListener () const { return cropImageListener; } + bool hasListener () { return cropImageListener; } void update (int todo); void setWindow (int cx, int cy, int cw, int ch, int skip) { setCropSizes (cx, cy, cw, ch, skip, false); } @@ -74,7 +74,7 @@ class Crop : public DetailedCrop { void setListener (DetailedCropListener* il); void destroy () {} - int get_skip () const { return skip;} + int get_skip () { return skip;} }; } #endif diff --git a/rtengine/demosaic_algos.cc b/rtengine/demosaic_algos.cc index 50b319d78..af3b6d509 100644 --- a/rtengine/demosaic_algos.cc +++ b/rtengine/demosaic_algos.cc @@ -1253,7 +1253,7 @@ void RawImageSource::refinement_lassus() #define TILEBORDER 10 #define CACHESIZE (TILESIZE+2*TILEBORDER) -inline void RawImageSource::dcb_initTileLimits(int &colMin, int &rowMin, int &colMax, int &rowMax, int x0, int y0, int border) const +inline void RawImageSource::dcb_initTileLimits(int &colMin, int &rowMin, int &colMax, int &rowMax, int x0, int y0, int border) { rowMin = border; colMin = border; @@ -1305,7 +1305,7 @@ void RawImageSource::fill_border( float (*cache )[4], int border, int x0, int y0 } } // saves red and blue -void RawImageSource::copy_to_buffer( float (*buffer)[3], float (*image)[4]) const +void RawImageSource::copy_to_buffer( float (*buffer)[3], float (*image)[4]) { for (int indx=0; indx < CACHESIZE*CACHESIZE; indx++) { buffer[indx][0]=image[indx][0]; //R @@ -1314,7 +1314,7 @@ void RawImageSource::copy_to_buffer( float (*buffer)[3], float (*image)[4]) cons } // restores red and blue -void RawImageSource::restore_from_buffer(float (*image)[4], float (*buffer)[3]) const +void RawImageSource::restore_from_buffer(float (*image)[4], float (*buffer)[3]) { for (int indx=0; indx < CACHESIZE*CACHESIZE; indx++) { image[indx][0]=buffer[indx][0]; //R diff --git a/rtengine/dfmanager.cc b/rtengine/dfmanager.cc index 6f8b1a935..a69c3ae30 100644 --- a/rtengine/dfmanager.cc +++ b/rtengine/dfmanager.cc @@ -111,7 +111,7 @@ void dfInfo::updateRawImage() { typedef unsigned int acc_t; if( !pathNames.empty() ){ - std::list::const_iterator iName = pathNames.begin(); + std::list::iterator iName = pathNames.begin(); ri = new RawImage(*iName); // First file used also for extra pixels informations (width,height, shutter, filters etc.. ) if( ri->loadRaw(true)){ delete ri; @@ -131,7 +131,7 @@ void dfInfo::updateRawImage() acc[row][col] = ri->data[row][col]; int nFiles = 1; // First file data already loaded - for(++iName; iName != pathNames.end(); ++iName){ + for( iName++; iName != pathNames.end(); iName++){ RawImage* temp = new RawImage(*iName); if( !temp->loadRaw(true)){ temp->compress_image(); //\ TODO would be better working on original, because is temporary @@ -226,7 +226,7 @@ void DFManager::init( Glib::ustring pathname ) }catch( std::exception& e ){} } // Where multiple shots exist for same group, move filename to list - for(dfList_t::iterator iter = dfList.begin(); iter != dfList.end(); ++iter){ + for( dfList_t::iterator iter = dfList.begin(); iter != dfList.end();iter++ ){ dfInfo &i = iter->second; if( !i.pathNames.empty() && !i.pathname.empty() ){ i.pathNames.push_back( i.pathname ); @@ -237,7 +237,7 @@ void DFManager::init( Glib::ustring pathname ) printf( "%s: %s\n",i.key().c_str(),i.pathname.c_str()); else{ printf( "%s: MEAN of \n ",i.key().c_str()); - for(std::list::const_iterator iter = i.pathNames.begin(); iter != i.pathNames.end(); ++iter) + for( std::list::iterator iter = i.pathNames.begin(); iter != i.pathNames.end();iter++ ) printf( "%s, ", iter->c_str() ); printf("\n"); } @@ -280,7 +280,7 @@ dfInfo *DFManager::addFileInfo(const Glib::ustring &filename ,bool pool ) iter = dfList.insert(std::pair< std::string,dfInfo>( key,n ) ); }else{ while( iter != dfList.end() && iter->second.key() == key && ABS(iter->second.timestamp - idata.getDateTimeAsTS()) >60*60*6 ) // 6 hour difference - ++iter; + iter++; if( iter != dfList.end() ) iter->second.pathNames.push_back( filename ); @@ -300,16 +300,15 @@ void DFManager::getStat( int &totFiles, int &totTemplates) { totFiles=0; totTemplates=0; - for(dfList_t::iterator iter = dfList.begin(); iter != dfList.end(); ++iter) { + for( dfList_t::iterator iter = dfList.begin(); iter != dfList.end();iter++ ){ dfInfo &i = iter->second; if( i.pathname.empty() ){ totTemplates++; totFiles += i.pathNames.size(); - } else { + }else totFiles++; } } -} /* The search for the best match is twofold: * if perfect matches for iso and shutter are found, then the list is scanned for lesser distance in time @@ -325,7 +324,7 @@ dfInfo* DFManager::find( const std::string &mak, const std::string &mod, int iso if( iter != dfList.end() ){ dfList_t::iterator bestMatch = iter; time_t bestDeltaTime = ABS(iter->second.timestamp - t); - for(++iter; iter != dfList.end() && !key.compare( iter->second.key()); ++iter){ + for(iter++; iter != dfList.end() && !key.compare( iter->second.key() ); iter++ ){ time_t d = ABS(iter->second.timestamp - t ); if( d< bestDeltaTime ){ bestMatch = iter; @@ -337,7 +336,7 @@ dfInfo* DFManager::find( const std::string &mak, const std::string &mod, int iso iter = dfList.begin(); dfList_t::iterator bestMatch = iter; double bestD = iter->second.distance( mak, mod, isospeed, shut ); - for(++iter; iter != dfList.end(); ++iter){ + for( iter++; iter != dfList.end();iter++ ){ double d = iter->second.distance( mak, mod, isospeed, shut ); if( d < bestD ){ bestD = d; @@ -359,7 +358,7 @@ RawImage* DFManager::searchDarkFrame( const std::string &mak, const std::string RawImage* DFManager::searchDarkFrame( const Glib::ustring filename ) { - for (dfList_t::iterator iter = dfList.begin(); iter != dfList.end(); ++iter){ + for ( dfList_t::iterator iter = dfList.begin(); iter != dfList.end();iter++ ){ if( iter->second.pathname.compare( filename )==0 ) return iter->second.getRawImage(); } @@ -370,7 +369,7 @@ RawImage* DFManager::searchDarkFrame( const Glib::ustring filename ) } std::list *DFManager::getHotPixels ( const Glib::ustring filename ) { - for (dfList_t::iterator iter = dfList.begin(); iter != dfList.end(); ++iter){ + for ( dfList_t::iterator iter = dfList.begin(); iter != dfList.end();iter++ ){ if( iter->second.pathname.compare( filename )==0 ) return &iter->second.getHotPixels(); } diff --git a/rtengine/dfmanager.h b/rtengine/dfmanager.h index b9a0f84ed..3a171b714 100644 --- a/rtengine/dfmanager.h +++ b/rtengine/dfmanager.h @@ -69,7 +69,7 @@ class DFManager { public: void init( Glib::ustring pathname ); - Glib::ustring getPathname() const { return currentPath; }; + Glib::ustring getPathname(){ return currentPath; }; void getStat( int &totFiles, int &totTemplate); RawImage *searchDarkFrame( const std::string &mak, const std::string &mod, int iso, double shut, time_t t ); RawImage *searchDarkFrame( const Glib::ustring filename ); diff --git a/rtengine/diagonalcurves.cc b/rtengine/diagonalcurves.cc index 49b6aa54d..9c74ba88c 100644 --- a/rtengine/diagonalcurves.cc +++ b/rtengine/diagonalcurves.cc @@ -319,7 +319,7 @@ double DiagonalCurve::getVal (double t) { void DiagonalCurve::getVal (const std::vector& t, std::vector& res) { res.resize (t.size()); - for (size_t i=0; idata[row][col]; int nFiles = 1; // First file data already loaded - for(++iName; iName != pathNames.end(); ++iName){ + for( iName++; iName != pathNames.end(); iName++){ RawImage* temp = new RawImage(*iName); if( !temp->loadRaw(true)){ temp->compress_image(); //\ TODO would be better working on original, because is temporary @@ -184,7 +184,7 @@ void FFManager::init( Glib::ustring pathname ) }catch( std::exception& e ){} } // Where multiple shots exist for same group, move filename to list - for(ffList_t::iterator iter = ffList.begin(); iter != ffList.end(); ++iter){ + for( ffList_t::iterator iter = ffList.begin(); iter != ffList.end();iter++ ){ ffInfo &i = iter->second; if( !i.pathNames.empty() && !i.pathname.empty() ){ i.pathNames.push_back( i.pathname ); @@ -195,7 +195,7 @@ void FFManager::init( Glib::ustring pathname ) printf( "%s: %s\n",i.key().c_str(),i.pathname.c_str()); else{ printf( "%s: MEAN of \n ",i.key().c_str()); - for(std::list::const_iterator iter = i.pathNames.begin(); iter != i.pathNames.end(); ++iter) + for( std::list::iterator iter = i.pathNames.begin(); iter != i.pathNames.end();iter++ ) printf( "%s, ", iter->c_str() ); printf("\n"); } @@ -238,7 +238,7 @@ ffInfo *FFManager::addFileInfo(const Glib::ustring &filename, bool pool ) iter = ffList.insert(std::pair< std::string,ffInfo>( key,n ) ); }else{ while( iter != ffList.end() && iter->second.key() == key && ABS(iter->second.timestamp - ri.get_timestamp()) >60*60*6 ) // 6 hour difference - ++iter; + iter++; if( iter != ffList.end() ) iter->second.pathNames.push_back( filename ); @@ -258,7 +258,7 @@ void FFManager::getStat( int &totFiles, int &totTemplates) { totFiles=0; totTemplates=0; - for(ffList_t::iterator iter = ffList.begin(); iter != ffList.end(); ++iter){ + for( ffList_t::iterator iter = ffList.begin(); iter != ffList.end();iter++ ){ ffInfo &i = iter->second; if( i.pathname.empty() ){ totTemplates++; @@ -282,7 +282,7 @@ ffInfo* FFManager::find( const std::string &mak, const std::string &mod, const s if( iter != ffList.end() ){ ffList_t::iterator bestMatch = iter; time_t bestDeltaTime = ABS(iter->second.timestamp - t); - for(++iter; iter != ffList.end() && !key.compare( iter->second.key() ); ++iter){ + for(iter++; iter != ffList.end() && !key.compare( iter->second.key() ); iter++ ){ time_t d = ABS(iter->second.timestamp - t ); if( d< bestDeltaTime ){ bestMatch = iter; @@ -294,7 +294,7 @@ ffInfo* FFManager::find( const std::string &mak, const std::string &mod, const s iter = ffList.begin(); ffList_t::iterator bestMatch = iter; double bestD = iter->second.distance( mak, mod, len, focal, apert ); - for(++iter; iter != ffList.end(); ++iter){ + for( iter++; iter != ffList.end();iter++ ){ double d = iter->second.distance( mak, mod, len, focal, apert ); if( d < bestD ){ bestD = d; @@ -316,7 +316,7 @@ RawImage* FFManager::searchFlatField( const std::string &mak, const std::string RawImage* FFManager::searchFlatField( const Glib::ustring filename ) { - for (ffList_t::iterator iter = ffList.begin(); iter != ffList.end(); ++iter){ + for ( ffList_t::iterator iter = ffList.begin(); iter != ffList.end();iter++ ){ if( iter->second.pathname.compare( filename )==0 ) return iter->second.getRawImage(); } diff --git a/rtengine/ffmanager.h b/rtengine/ffmanager.h index 1f8264d62..415eaff9b 100644 --- a/rtengine/ffmanager.h +++ b/rtengine/ffmanager.h @@ -69,7 +69,7 @@ class FFManager { public: void init( Glib::ustring pathname ); - Glib::ustring getPathname() const { return currentPath; }; + Glib::ustring getPathname(){ return currentPath; }; void getStat( int &totFiles, int &totTemplate); RawImage *searchFlatField( const std::string &mak, const std::string &mod, const std::string &len, double focallength, double apert, time_t t ); RawImage *searchFlatField( const Glib::ustring filename ); diff --git a/rtengine/flatcurves.cc b/rtengine/flatcurves.cc index ae6bdc97b..1f64bce45 100644 --- a/rtengine/flatcurves.cc +++ b/rtengine/flatcurves.cc @@ -298,11 +298,11 @@ void FlatCurve::CtrlPoints_set () { // Checking the values Glib::ustring fname = "Curve.xyz"; // TopSolid'Design "plot" file format std::ofstream f (fname.c_str()); - f << "$" << std::endl; - for (size_t iter = 0; iter < poly_x.size(); iter++) { - f << poly_x[iter] << ", " << poly_y[iter] << ", 0." << std::endl; + f << "$" << std::endl;; + for (unsigned int iter = 0; iter < poly_x.size(); iter++) { + f << poly_x[iter] << ", " << poly_y[iter] << ", 0." << std::endl;; } - f << "$" << std::endl; + f << "$" << std::endl;; f.close (); */ } @@ -351,7 +351,7 @@ double FlatCurve::getVal (double t) { void FlatCurve::getVal (const std::vector& t, std::vector& res) { res.resize (t.size()); - for (size_t i=0; i void gaussHorizontal (T** src, T** dst, AlignedBuffer* double csum = 2.0 * c1 + 1.0; c1 /= csum; double c0 = 1.0 / csum; - gaussHorizontal3 (src, dst, reinterpret_cast(buffer->data), W, H, c0, c1, multiThread); + gaussHorizontal3 (src, dst, (T*)(buffer->data), W, H, c0, c1, multiThread); return; } @@ -156,7 +156,7 @@ template void gaussVertical (T** src, T** dst, AlignedBuffer* b double csum = 2.0 * c1 + 1.0; c1 /= csum; double c0 = 1.0 / csum; - gaussVertical3 (src, dst, reinterpret_cast(buffer->data), W, H, c0, c1, multiThread); + gaussVertical3 (src, dst, (T*)(buffer->data), W, H, c0, c1, multiThread); return; } diff --git a/rtengine/iccstore.cc b/rtengine/iccstore.cc index 5bc0fe5b3..c6721d722 100644 --- a/rtengine/iccstore.cc +++ b/rtengine/iccstore.cc @@ -65,7 +65,7 @@ std::vector ICCStore::getOutputProfiles () { Glib::Mutex::Lock lock(mutex_); std::vector res; - for (std::map::const_iterator i=fileProfiles.begin(); i!=fileProfiles.end(); ++i){ + for (std::map::iterator i=fileProfiles.begin(); i!=fileProfiles.end(); i++){ std::string name(i->first); std::string::size_type i2 = name.find_last_of('/'); if( i2 == std::string::npos ) @@ -110,14 +110,14 @@ ICCStore::ICCStore () srgb = cmsCreate_sRGBProfile (); } -int ICCStore::numOfWProfiles () const { +int ICCStore::numOfWProfiles () { return sizeof(wpnames)/sizeof(wpnames[0]); } TMatrix ICCStore::workingSpaceMatrix (Glib::ustring name) { - std::map::const_iterator r = wMatrices.find (name); + std::map::iterator r = wMatrices.find (name); if (r!=wMatrices.end()) return r->second; else @@ -126,7 +126,7 @@ TMatrix ICCStore::workingSpaceMatrix (Glib::ustring name) { TMatrix ICCStore::workingSpaceInverseMatrix (Glib::ustring name) { - std::map::const_iterator r = iwMatrices.find (name); + std::map::iterator r = iwMatrices.find (name); if (r!=iwMatrices.end()) return r->second; else @@ -135,7 +135,7 @@ TMatrix ICCStore::workingSpaceInverseMatrix (Glib::ustring name) { cmsHPROFILE ICCStore::workingSpace (Glib::ustring name) { - std::map::const_iterator r = wProfiles.find (name); + std::map::iterator r = wProfiles.find (name); if (r!=wProfiles.end()) return r->second; else @@ -144,7 +144,7 @@ cmsHPROFILE ICCStore::workingSpace (Glib::ustring name) { cmsHPROFILE ICCStore::workingSpaceGamma (Glib::ustring name) { - std::map::const_iterator r = wProfilesGamma.find (name); + std::map::iterator r = wProfilesGamma.find (name); if (r!=wProfilesGamma.end()) return r->second; else @@ -155,7 +155,7 @@ cmsHPROFILE ICCStore::getProfile (Glib::ustring name) { Glib::Mutex::Lock lock(mutex_); - std::map::const_iterator r = fileProfiles.find (name); + std::map::iterator r = fileProfiles.find (name); if (r!=fileProfiles.end()) return r->second; else { @@ -179,7 +179,7 @@ cmsHPROFILE ICCStore::getStdProfile (Glib::ustring name) { Glib::Mutex::Lock lock(mutex_); - std::map::const_iterator r = fileStdProfiles.find (name.uppercase()); + std::map::iterator r = fileStdProfiles.find (name.uppercase()); if (r==fileStdProfiles.end()) return NULL; return r->second; @@ -212,7 +212,7 @@ void ICCStore::init (Glib::ustring usrICCDir, Glib::ustring rtICCDir) { } void ICCStore::loadICCs(Glib::ustring rootDirName, bool nameUpper, std::map& resultProfiles, std::map &resultProfileContents) { - if (!rootDirName.empty()) { + if (rootDirName!="") { std::deque qDirs; qDirs.push_front(rootDirName); diff --git a/rtengine/iccstore.h b/rtengine/iccstore.h index e2acfeae0..acad32c9d 100644 --- a/rtengine/iccstore.h +++ b/rtengine/iccstore.h @@ -73,7 +73,7 @@ class ICCStore { Glib::ustring defaultMonitorProfile; // Main monitors standard profile name, from OS void findDefaultMonitorProfile(); - int numOfWProfiles () const; + int numOfWProfiles (); cmsHPROFILE createFromMatrix (const double matrix[3][3], bool gamma=false, Glib::ustring name=""); cmsHPROFILE workingSpace (Glib::ustring name); cmsHPROFILE workingSpaceGamma (Glib::ustring name); @@ -86,8 +86,8 @@ class ICCStore { void init (Glib::ustring usrICCDir, Glib::ustring stdICCDir); ProfileContent getContent (Glib::ustring name); - cmsHPROFILE getXYZProfile () const { return xyz; } - cmsHPROFILE getsRGBProfile () const { return srgb; } + cmsHPROFILE getXYZProfile () { return xyz; } + cmsHPROFILE getsRGBProfile () { return srgb; } std::vector getOutputProfiles (); }; diff --git a/rtengine/imagedata.cc b/rtengine/imagedata.cc index 7e9d0f3d3..a46e07c33 100644 --- a/rtengine/imagedata.cc +++ b/rtengine/imagedata.cc @@ -194,7 +194,7 @@ void ImageData::extractInfo () { bool lensOk = false; if (mnote->getTag ("LensData")) { std::string ldata = mnote->getTag ("LensData")->valueToString (); - size_t pos; + int pos; if (ldata.size()>10 && (pos=ldata.find ("Lens = "))!=Glib::ustring::npos) { lens = ldata.substr (pos + 7); if (lens.compare (0, 7, "Unknown")) @@ -336,7 +336,7 @@ std::string ImageMetaData::shutterToString (double shutter) { std::string ImageMetaData::expcompToString (double expcomp, bool maskZeroexpcomp) { char buffer[256]; - if (maskZeroexpcomp){ + if (maskZeroexpcomp==true){ if (expcomp!=0.0){ sprintf (buffer, "%0.2f", expcomp); return buffer; diff --git a/rtengine/imageio.cc b/rtengine/imageio.cc index 87350db9b..0c8061a28 100644 --- a/rtengine/imageio.cc +++ b/rtengine/imageio.cc @@ -52,7 +52,7 @@ void ImageIO::setMetadata (const rtexif::TagDirectory* eroot) { if (exifRoot!=NULL) { delete exifRoot; exifRoot = NULL; } if (eroot) { - rtexif::TagDirectory* td = (const_cast(eroot))->clone (NULL); + rtexif::TagDirectory* td = ((rtexif::TagDirectory*)eroot)->clone (NULL); // make IPTC and XMP pass through td->keepTag(0x83bb); // IPTC @@ -78,7 +78,7 @@ void ImageIO::setMetadata (const rtexif::TagDirectory* eroot, const rtengine::pr if (exifRoot!=NULL) { delete exifRoot; exifRoot = NULL; } if (eroot) - exifRoot = (const_cast(eroot))->clone (NULL); + exifRoot = ((rtexif::TagDirectory*)eroot)->clone (NULL); if (iptc!=NULL) { iptc_data_free (iptc); iptc = NULL; } @@ -89,7 +89,7 @@ void ImageIO::setMetadata (const rtexif::TagDirectory* eroot, const rtengine::pr iptc = iptc_data_new (); for (rtengine::procparams::IPTCPairs::const_iterator i=iptcc.begin(); i!=iptcc.end(); i++) { if (i->first == "Keywords" && !(i->second.empty())) { - for (size_t j=0; jsecond.size(); j++) { + for (unsigned int j=0; jsecond.size(); j++) { IptcDataSet * ds = iptc_dataset_new (); iptc_dataset_set_tag (ds, IPTC_RECORD_APP_2, IPTC_TAG_KEYWORDS); std::string loc = safe_locale_to_utf8(i->second.at(j)); @@ -100,7 +100,7 @@ void ImageIO::setMetadata (const rtexif::TagDirectory* eroot, const rtengine::pr continue; } else if (i->first == "SupplementalCategories" && !(i->second.empty())) { - for (size_t j=0; jsecond.size(); j++) { + for (unsigned int j=0; jsecond.size(); j++) { IptcDataSet * ds = iptc_dataset_new (); iptc_dataset_set_tag (ds, IPTC_RECORD_APP_2, IPTC_TAG_SUPPL_CATEGORY); std::string loc = safe_locale_to_utf8(i->second.at(j)); @@ -745,7 +745,7 @@ int ImageIO::saveTIFF (Glib::ustring fname, int bps, bool uncompressed) { if (iptcdata) iptc_data_free_buf (iptc, iptcdata); - // The maximum length is strangely not the same than for the JPEG file... + // The maximum lenght is strangely not the same than for the JPEG file... // Which maximum length is the good one ? if (size>0 && size<165530) fwrite (buffer, size, 1, file); diff --git a/rtengine/imageio.h b/rtengine/imageio.h index 211a8a5df..ea08bbc0f 100644 --- a/rtengine/imageio.h +++ b/rtengine/imageio.h @@ -79,8 +79,8 @@ class ImageIO { int saveJPEG (Glib::ustring fname, int quality = 100); int saveTIFF (Glib::ustring fname, int bps = -1, bool uncompressed = false); - cmsHPROFILE getEmbeddedProfile () const { return embProfile; } - void getEmbeddedProfileData (int& length, unsigned char*& pdata) const { length = loadedProfileLength; pdata = (unsigned char*)loadedProfileData; } + cmsHPROFILE getEmbeddedProfile () { return embProfile; } + void getEmbeddedProfileData (int& length, unsigned char*& pdata) { length = loadedProfileLength; pdata = (unsigned char*)loadedProfileData; } void setMetadata (const rtexif::TagDirectory* eroot); void setMetadata (const rtexif::TagDirectory* eroot, const rtengine::procparams::ExifPairs& exif, const rtengine::procparams::IPTCPairs& iptcc); diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc index 8046d8caf..ecf170a45 100644 --- a/rtengine/improccoordinator.cc +++ b/rtengine/improccoordinator.cc @@ -479,7 +479,7 @@ void ImProcCoordinator::updateLRGBHistograms () { } void ImProcCoordinator::progress (Glib::ustring str, int pr) { -// TODO: why is it empty? + /* if (plistener) { plistener->setProgressStr (str); plistener->setProgress ((double)pr / 100.0); diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc index 3a02c907f..4bdc4e68e 100644 --- a/rtengine/improcfun.cc +++ b/rtengine/improcfun.cc @@ -494,7 +494,7 @@ void ImProcFunctions::chrominanceCurve (LabImage* lold, LabImage* lnew, LUTf & a //#include "cubic.cc" void ImProcFunctions::colorCurve (LabImage* lold, LabImage* lnew) { -// TODO: remove commented code? + /* LUT cmultiplier(181021); double boost_a = ((float)params->colorBoost.amount + 100.0) / 100.0; @@ -871,7 +871,7 @@ fclose(f);*/ //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% double ImProcFunctions::getAutoDistor (const Glib::ustring &fname, int thumb_size) { - if (!fname.empty()) { + if (fname != "") { rtengine::RawMetaDataLocation ri; int w_raw=-1, h_raw=thumb_size; int w_thumb=-1, h_thumb=thumb_size; diff --git a/rtengine/improcfun.h b/rtengine/improcfun.h index 077e7214c..09dcf6f4e 100644 --- a/rtengine/improcfun.h +++ b/rtengine/improcfun.h @@ -51,11 +51,11 @@ class ImProcFunctions { void firstAnalysisThread(Imagefloat* original, Glib::ustring wprofile, unsigned int* histogram, int row_from, int row_to); void dcdamping (float** aI, float** aO, float damping, int W, int H); - bool needsCA () const; - bool needsDistortion () const; - bool needsRotation () const; - bool needsPerspective () const; - bool needsVignetting () const; + bool needsCA (); + bool needsDistortion (); + bool needsRotation (); + bool needsPerspective (); + bool needsVignetting (); // static cmsUInt8Number* Mempro = NULL; @@ -108,7 +108,7 @@ class ImProcFunctions { void setScale (double iscale); - bool needsTransform () const; + bool needsTransform (); void firstAnalysis (Imagefloat* working, const ProcParams* params, LUTu & vhist16, double gamma); void rgbProc (Imagefloat* working, LabImage* lab, LUTf & hltonecurve, LUTf & shtonecurve, LUTf & tonecurve, @@ -116,8 +116,8 @@ class ImProcFunctions { void luminanceCurve (LabImage* lold, LabImage* lnew, LUTf &curve); void chrominanceCurve (LabImage* lold, LabImage* lnew, LUTf &acurve, LUTf &bcurve, LUTf & satcurve); void vibrance (LabImage* lab);//Jacques' vibrance - void skinsat (float lum, float hue, float chrom, float &satreduc) const;//jacques Skin color - void MunsellLch (float lum, float hue, float chrom, float memChprov, float &correction, int zone) const;//jacques: Munsell correction + void skinsat (float lum, float hue, float chrom, float &satreduc);//jacques Skin color + void MunsellLch (float lum, float hue, float chrom, float memChprov, float &correction, int zone);//jacques: Munsell correction void colorCurve (LabImage* lold, LabImage* lnew); void sharpening (LabImage* lab, float** buffer); void transform (Imagefloat* original, Imagefloat* transformed, int cx, int cy, int sx, int sy, int oW, int oH); @@ -173,7 +173,7 @@ class ImProcFunctions { void calcGamma (double pwr, double ts, int mode, int imax, double &gamma0, double &gamma1, double &gamma2, double &gamma3, double &gamma4,double &gamma5); //void gamutmap(LabImage* ); - void gamutmap(float &X, float &Y, float &Z, const double p[3][3]) const; + void gamutmap(float &X, float &Y, float &Z, const double p[3][3]); static inline float f2xyz(float f) { const float epsilonExpInv3 = 6.0/29.0; diff --git a/rtengine/ipsharpen.cc b/rtengine/ipsharpen.cc index cecdf2f58..ad11a6b9c 100644 --- a/rtengine/ipsharpen.cc +++ b/rtengine/ipsharpen.cc @@ -62,7 +62,7 @@ void ImProcFunctions::dcdamping (float** aI, float** aO, float damping, int W, i void ImProcFunctions::deconvsharpening (LabImage* lab, float** b2) { - if (!params->sharpening.enabled || params->sharpening.deconvamount<1) + if (params->sharpening.enabled==false || params->sharpening.deconvamount<1) return; int W = lab->W, H = lab->H; @@ -139,7 +139,7 @@ void ImProcFunctions::sharpening (LabImage* lab, float** b2) { } // Rest is UNSHARP MASK - if (!params->sharpening.enabled || params->sharpening.amount<1 || lab->W<8 || lab->H<8) + if (params->sharpening.enabled==false || params->sharpening.amount<1 || lab->W<8 || lab->H<8) return; int W = lab->W, H = lab->H; @@ -156,7 +156,7 @@ void ImProcFunctions::sharpening (LabImage* lab, float** b2) { AlignedBuffer* buffer = new AlignedBuffer (max(W,H)); - if (!params->sharpening.edgesonly) { + if (params->sharpening.edgesonly==false) { gaussHorizontal (lab->L, b2, buffer, W, H, params->sharpening.radius / scale, multiThread); gaussVertical (b2, b2, buffer, W, H, params->sharpening.radius / scale, multiThread); @@ -172,7 +172,7 @@ void ImProcFunctions::sharpening (LabImage* lab, float** b2) { if (params->sharpening.edgesonly) base = b3; - if (!params->sharpening.halocontrol) { + if (params->sharpening.halocontrol==false) { #pragma omp for for (int i=0; isharpenEdge.enabled) + if (params->sharpenEdge.enabled==false) return; MyTime t1e,t2e; t1e.set(); @@ -421,12 +421,12 @@ void ImProcFunctions::MLsharpen (LabImage* lab) { // http://creativecommons.org/publicdomain/zero/1.0/ // addition from JD : pyramid + ponderated contrast with matrix 5x5 void ImProcFunctions::MLmicrocontrast(LabImage* lab) { - if (!params->sharpenMicro.enabled) + if (params->sharpenMicro.enabled==false) return; MyTime t1e,t2e; t1e.set(); int k; - if (!params->sharpenMicro.matrix) k=2; else k=1; + if (params->sharpenMicro.matrix == false) k=2; else k=1; // k=2 matrix 5x5 k=1 matrix 3x3 int offset,offset2,i,j,col,row,n; float temp,temp2,temp3,temp4,tempL; diff --git a/rtengine/iptransform.cc b/rtengine/iptransform.cc index f157032e0..6cea52924 100644 --- a/rtengine/iptransform.cc +++ b/rtengine/iptransform.cc @@ -585,27 +585,27 @@ double ImProcFunctions::getTransformAutoFill (int oW, int oH) { return scaleL; } -bool ImProcFunctions::needsCA () const { +bool ImProcFunctions::needsCA () { return fabs (params->cacorrection.red) > 1e-15 || fabs (params->cacorrection.blue) > 1e-15; } -bool ImProcFunctions::needsDistortion () const { +bool ImProcFunctions::needsDistortion () { return fabs (params->distortion.amount) > 1e-15; } -bool ImProcFunctions::needsRotation () const { +bool ImProcFunctions::needsRotation () { return fabs (params->rotate.degree) > 1e-15; } -bool ImProcFunctions::needsPerspective () const { +bool ImProcFunctions::needsPerspective () { return params->perspective.horizontal || params->perspective.vertical; } -bool ImProcFunctions::needsVignetting () const { +bool ImProcFunctions::needsVignetting () { return params->vignetting.amount; } -bool ImProcFunctions::needsTransform () const { +bool ImProcFunctions::needsTransform () { return needsCA () || needsDistortion () || needsRotation () || needsPerspective () || needsVignetting (); } diff --git a/rtengine/ipvibrance.cc b/rtengine/ipvibrance.cc index e7f858fad..1f461bc02 100644 --- a/rtengine/ipvibrance.cc +++ b/rtengine/ipvibrance.cc @@ -1665,7 +1665,7 @@ _5GY80(maxInd); -void ImProcFunctions::MunsellLch (float lum, float hue, float chrom, float memChprov, float &correction, int zone) const { +void ImProcFunctions::MunsellLch (float lum, float hue, float chrom, float memChprov, float &correction, int zone) { int x=(int) memChprov; int y=(int) chrom; @@ -1943,7 +1943,7 @@ void ImProcFunctions::MunsellLch (float lum, float hue, float chrom, float memCh * pay attention to white balance, and do not change hue and saturation, upstream of the modification * */ -void ImProcFunctions::skinsat (float lum, float hue, float chrom, float &satreduc) const { +void ImProcFunctions::skinsat (float lum, float hue, float chrom, float &satreduc) { float reduction=0.3;// to be adapted...by tests float extendedreduction=0.4; diff --git a/rtengine/klt/klt.cc b/rtengine/klt/klt.cc index fe31e6c12..f650e5e81 100644 --- a/rtengine/klt/klt.cc +++ b/rtengine/klt/klt.cc @@ -160,7 +160,7 @@ KLT_FeatureList KLTCreateFeatureList( fl->nFeatures = nFeatures; /* Set pointers */ - fl->feature = reinterpret_cast(fl + 1); + fl->feature = (KLT_Feature *) (fl + 1); first = (KLT_Feature) (fl->feature + nFeatures); for (i = 0 ; i < nFeatures ; i++) { fl->feature[i] = first + i; @@ -195,7 +195,7 @@ KLT_FeatureHistory KLTCreateFeatureHistory( fh->nFrames = nFrames; /* Set pointers */ - fh->feature = reinterpret_cast(fh + 1); + fh->feature = (KLT_Feature *) (fh + 1); first = (KLT_Feature) (fh->feature + nFrames); for (i = 0 ; i < nFrames ; i++) fh->feature[i] = first + i; diff --git a/rtengine/klt/pyramid.cc b/rtengine/klt/pyramid.cc index c0312f860..e8b9f47ec 100644 --- a/rtengine/klt/pyramid.cc +++ b/rtengine/klt/pyramid.cc @@ -51,7 +51,7 @@ _KLT_Pyramid _KLTCreatePyramid( /* Set parameters */ pyramid->subsampling = subsampling; pyramid->nLevels = nlevels; - pyramid->img = reinterpret_cast<_KLT_FloatImage *> (pyramid + 1); + pyramid->img = (_KLT_FloatImage *) (pyramid + 1); pyramid->ncols = (int *) (pyramid->img + nlevels); pyramid->nrows = (int *) (pyramid->ncols + nlevels); diff --git a/rtengine/klt/trackFeatures.cc b/rtengine/klt/trackFeatures.cc index ccac64753..2b6b81f5f 100644 --- a/rtengine/klt/trackFeatures.cc +++ b/rtengine/klt/trackFeatures.cc @@ -1462,7 +1462,7 @@ void KLTTrackFeatures( _am_getSubFloatImage(pyramid1_gradx->img[0],xloc,yloc,featurelist->feature[indx]->aff_img_gradx); _am_getSubFloatImage(pyramid1_grady->img[0],xloc,yloc,featurelist->feature[indx]->aff_img_grady); featurelist->feature[indx]->aff_x = xloc - (int) xloc + (tc->affine_window_width+border)/2; - featurelist->feature[indx]->aff_y = yloc - (int) yloc + (tc->affine_window_height+border)/2; + featurelist->feature[indx]->aff_y = yloc - (int) yloc + (tc->affine_window_height+border)/2;; }else{ /* affine tracking */ val = _am_trackFeatureAffine(featurelist->feature[indx]->aff_x, featurelist->feature[indx]->aff_y, diff --git a/rtengine/mytime.h b/rtengine/mytime.h index 02ae1501f..19b963ca8 100644 --- a/rtengine/mytime.h +++ b/rtengine/mytime.h @@ -59,7 +59,7 @@ class MyTime { #endif } - int etime (MyTime a) const { + int etime (MyTime a) { #ifndef WIN32 return (t.tv_sec-a.t.tv_sec)*1000000 + (t.tv_nsec-a.t.tv_nsec)/1000; #else diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index a8075615f..bd49c6346 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -83,7 +83,7 @@ void WBParams::init() { } void WBParams::cleanup() { - for (size_t i=0; igeneral.rank) keyFile.set_integer ("General", "Rank", rank); - if (pedited->general.colorlabel) keyFile.set_integer ("General", "ColorLabel", colorlabel); - if (pedited->general.intrash) keyFile.set_boolean ("General", "InTrash", inTrash); + if (!pedited || pedited->general.rank) keyFile.set_integer ("General", "Rank", rank); + if (!pedited || pedited->general.colorlabel) keyFile.set_integer ("General", "ColorLabel", colorlabel); + if (!pedited || pedited->general.intrash) keyFile.set_boolean ("General", "InTrash", inTrash); // save tonecurve: - if (pedited->toneCurve.autoexp) keyFile.set_boolean ("Exposure", "Auto", toneCurve.autoexp); - if (pedited->toneCurve.clip) keyFile.set_double ("Exposure", "Clip", toneCurve.clip); - if (pedited->toneCurve.expcomp) keyFile.set_double ("Exposure", "Compensation", toneCurve.expcomp); - if (pedited->toneCurve.brightness) keyFile.set_integer ("Exposure", "Brightness", toneCurve.brightness); - if (pedited->toneCurve.contrast) keyFile.set_integer ("Exposure", "Contrast", toneCurve.contrast); - if (pedited->toneCurve.saturation) keyFile.set_integer ("Exposure", "Saturation", toneCurve.saturation); - if (pedited->toneCurve.black) keyFile.set_integer ("Exposure", "Black", toneCurve.black); - if (pedited->toneCurve.hlcompr) keyFile.set_integer ("Exposure", "HighlightCompr", toneCurve.hlcompr); - if (pedited->toneCurve.hlcomprthresh) keyFile.set_integer ("Exposure", "HighlightComprThreshold", toneCurve.hlcomprthresh); - if (pedited->toneCurve.shcompr) keyFile.set_integer ("Exposure", "ShadowCompr", toneCurve.shcompr); - if (pedited->toneCurve.curve) { + if (!pedited || pedited->toneCurve.autoexp) keyFile.set_boolean ("Exposure", "Auto", toneCurve.autoexp); + if (!pedited || pedited->toneCurve.clip) keyFile.set_double ("Exposure", "Clip", toneCurve.clip); + if (!pedited || pedited->toneCurve.expcomp) keyFile.set_double ("Exposure", "Compensation", toneCurve.expcomp); + if (!pedited || pedited->toneCurve.brightness) keyFile.set_integer ("Exposure", "Brightness", toneCurve.brightness); + if (!pedited || pedited->toneCurve.contrast) keyFile.set_integer ("Exposure", "Contrast", toneCurve.contrast); + if (!pedited || pedited->toneCurve.saturation) keyFile.set_integer ("Exposure", "Saturation", toneCurve.saturation); + if (!pedited || pedited->toneCurve.black) keyFile.set_integer ("Exposure", "Black", toneCurve.black); + if (!pedited || pedited->toneCurve.hlcompr) keyFile.set_integer ("Exposure", "HighlightCompr", toneCurve.hlcompr); + if (!pedited || pedited->toneCurve.hlcomprthresh) keyFile.set_integer ("Exposure", "HighlightComprThreshold", toneCurve.hlcomprthresh); + if (!pedited || pedited->toneCurve.shcompr) keyFile.set_integer ("Exposure", "ShadowCompr", toneCurve.shcompr); + if (!pedited || pedited->toneCurve.curve) { Glib::ArrayHandle tcurve = toneCurve.curve; keyFile.set_double_list("Exposure", "Curve", tcurve); } // save channel mixer - if (pedited->chmixer.red[0] || pedited->chmixer.red[1] || pedited->chmixer.red[2]) { + if (!pedited || pedited->chmixer.red[0] || pedited->chmixer.red[1] || pedited->chmixer.red[2]) { Glib::ArrayHandle rmix (chmixer.red, 3, Glib::OWNERSHIP_NONE); keyFile.set_integer_list("Channel Mixer", "Red", rmix); } - if (pedited->chmixer.green[0] || pedited->chmixer.green[1] || pedited->chmixer.green[2]) { + if (!pedited || pedited->chmixer.green[0] || pedited->chmixer.green[1] || pedited->chmixer.green[2]) { Glib::ArrayHandle gmix (chmixer.green, 3, Glib::OWNERSHIP_NONE); keyFile.set_integer_list("Channel Mixer", "Green", gmix); } - if (pedited->chmixer.blue[0] || pedited->chmixer.blue[1] || pedited->chmixer.blue[2]) { + if (!pedited || pedited->chmixer.blue[0] || pedited->chmixer.blue[1] || pedited->chmixer.blue[2]) { Glib::ArrayHandle bmix (chmixer.blue, 3, Glib::OWNERSHIP_NONE); keyFile.set_integer_list("Channel Mixer", "Blue", bmix); } // save luma curve - if (pedited->labCurve.brightness) keyFile.set_integer ("Luminance Curve", "Brightness", labCurve.brightness); - if (pedited->labCurve.contrast) keyFile.set_integer ("Luminance Curve", "Contrast", labCurve.contrast); - if (pedited->labCurve.saturation) keyFile.set_integer ("Luminance Curve", "Saturation", labCurve.saturation); - if (pedited->labCurve.avoidclip) keyFile.set_boolean ("Luminance Curve", "AvoidColorClipping", labCurve.avoidclip); - if (pedited->labCurve.enable_saturationlimiter) keyFile.set_boolean ("Luminance Curve", "SaturationLimiter", labCurve.enable_saturationlimiter); - if (pedited->labCurve.saturationlimit) keyFile.set_double ("Luminance Curve", "SaturationLimit", labCurve.saturationlimit); - if (pedited->labCurve.lcurve) { + if (!pedited || pedited->labCurve.brightness) keyFile.set_integer ("Luminance Curve", "Brightness", labCurve.brightness); + if (!pedited || pedited->labCurve.contrast) keyFile.set_integer ("Luminance Curve", "Contrast", labCurve.contrast); + if (!pedited || pedited->labCurve.saturation) keyFile.set_integer ("Luminance Curve", "Saturation", labCurve.saturation); + if (!pedited || pedited->labCurve.avoidclip) keyFile.set_boolean ("Luminance Curve", "AvoidColorClipping", labCurve.avoidclip); + if (!pedited || pedited->labCurve.enable_saturationlimiter) keyFile.set_boolean ("Luminance Curve", "SaturationLimiter", labCurve.enable_saturationlimiter); + if (!pedited || pedited->labCurve.saturationlimit) keyFile.set_double ("Luminance Curve", "SaturationLimit", labCurve.saturationlimit); + if (!pedited || pedited->labCurve.lcurve) { Glib::ArrayHandle lcurve = labCurve.lcurve; keyFile.set_double_list("Luminance Curve", "LCurve", lcurve); } - if (pedited->labCurve.acurve) { + if (!pedited || pedited->labCurve.acurve) { Glib::ArrayHandle acurve = labCurve.acurve; keyFile.set_double_list("Luminance Curve", "aCurve", acurve); } - if (pedited->labCurve.bcurve) { + if (!pedited || pedited->labCurve.bcurve) { Glib::ArrayHandle bcurve = labCurve.bcurve; keyFile.set_double_list("Luminance Curve", "bCurve", bcurve); } // save sharpening - if (pedited->sharpening.enabled) keyFile.set_boolean ("Sharpening", "Enabled", sharpening.enabled); - if (pedited->sharpening.method) keyFile.set_string ("Sharpening", "Method", sharpening.method); - if (pedited->sharpening.radius) keyFile.set_double ("Sharpening", "Radius", sharpening.radius); - if (pedited->sharpening.amount) keyFile.set_integer ("Sharpening", "Amount", sharpening.amount); - if (pedited->sharpening.threshold) keyFile.set_integer ("Sharpening", "Threshold", sharpening.threshold); - if (pedited->sharpening.edgesonly) keyFile.set_boolean ("Sharpening", "OnlyEdges", sharpening.edgesonly); - if (pedited->sharpening.edges_radius) keyFile.set_double ("Sharpening", "EdgedetectionRadius", sharpening.edges_radius); - if (pedited->sharpening.edges_tolerance) keyFile.set_integer ("Sharpening", "EdgeTolerance", sharpening.edges_tolerance); - if (pedited->sharpening.halocontrol) keyFile.set_boolean ("Sharpening", "HalocontrolEnabled", sharpening.halocontrol); - if (pedited->sharpening.halocontrol_amount) keyFile.set_integer ("Sharpening", "HalocontrolAmount", sharpening.halocontrol_amount); - if (pedited->sharpening.deconvradius) keyFile.set_double ("Sharpening", "DeconvRadius", sharpening.deconvradius); - if (pedited->sharpening.deconvamount) keyFile.set_integer ("Sharpening", "DeconvAmount", sharpening.deconvamount); - if (pedited->sharpening.deconvdamping) keyFile.set_integer ("Sharpening", "DeconvDamping", sharpening.deconvdamping); - if (pedited->sharpening.deconviter) keyFile.set_integer ("Sharpening", "DeconvIterations", sharpening.deconviter); + if (!pedited || pedited->sharpening.enabled) keyFile.set_boolean ("Sharpening", "Enabled", sharpening.enabled); + if (!pedited || pedited->sharpening.method) keyFile.set_string ("Sharpening", "Method", sharpening.method); + if (!pedited || pedited->sharpening.radius) keyFile.set_double ("Sharpening", "Radius", sharpening.radius); + if (!pedited || pedited->sharpening.amount) keyFile.set_integer ("Sharpening", "Amount", sharpening.amount); + if (!pedited || pedited->sharpening.threshold) keyFile.set_integer ("Sharpening", "Threshold", sharpening.threshold); + if (!pedited || pedited->sharpening.edgesonly) keyFile.set_boolean ("Sharpening", "OnlyEdges", sharpening.edgesonly); + if (!pedited || pedited->sharpening.edges_radius) keyFile.set_double ("Sharpening", "EdgedetectionRadius", sharpening.edges_radius); + if (!pedited || pedited->sharpening.edges_tolerance) keyFile.set_integer ("Sharpening", "EdgeTolerance", sharpening.edges_tolerance); + if (!pedited || pedited->sharpening.halocontrol) keyFile.set_boolean ("Sharpening", "HalocontrolEnabled", sharpening.halocontrol); + if (!pedited || pedited->sharpening.halocontrol_amount) keyFile.set_integer ("Sharpening", "HalocontrolAmount", sharpening.halocontrol_amount); + if (!pedited || pedited->sharpening.deconvradius) keyFile.set_double ("Sharpening", "DeconvRadius", sharpening.deconvradius); + if (!pedited || pedited->sharpening.deconvamount) keyFile.set_integer ("Sharpening", "DeconvAmount", sharpening.deconvamount); + if (!pedited || pedited->sharpening.deconvdamping) keyFile.set_integer ("Sharpening", "DeconvDamping", sharpening.deconvdamping); + if (!pedited || pedited->sharpening.deconviter) keyFile.set_integer ("Sharpening", "DeconvIterations", sharpening.deconviter); // save vibrance - if (pedited->vibrance.enabled) keyFile.set_boolean ("Vibrance", "Enabled", vibrance.enabled); - if (pedited->vibrance.pastels) keyFile.set_integer ("Vibrance", "Pastels", vibrance.pastels); - if (pedited->vibrance.saturated) keyFile.set_integer ("Vibrance", "Saturated", vibrance.saturated); - if (pedited->vibrance.psthreshold) keyFile.set_integer ("Vibrance", "PSThreshold", vibrance.psthreshold); - if (pedited->vibrance.protectskins) keyFile.set_boolean ("Vibrance", "ProtectSkins", vibrance.protectskins); - if (pedited->vibrance.avoidcolorshift) keyFile.set_boolean ("Vibrance", "AvoidColorShift", vibrance.avoidcolorshift); - if (pedited->vibrance.pastsattog) keyFile.set_boolean ("Vibrance", "PastSatTog", vibrance.pastsattog); + if (!pedited || pedited->vibrance.enabled) keyFile.set_boolean ("Vibrance", "Enabled", vibrance.enabled); + if (!pedited || pedited->vibrance.pastels) keyFile.set_integer ("Vibrance", "Pastels", vibrance.pastels); + if (!pedited || pedited->vibrance.saturated) keyFile.set_integer ("Vibrance", "Saturated", vibrance.saturated); + if (!pedited || pedited->vibrance.psthreshold) keyFile.set_integer ("Vibrance", "PSThreshold", vibrance.psthreshold); + if (!pedited || pedited->vibrance.protectskins) keyFile.set_boolean ("Vibrance", "ProtectSkins", vibrance.protectskins); + if (!pedited || pedited->vibrance.avoidcolorshift) keyFile.set_boolean ("Vibrance", "AvoidColorShift", vibrance.avoidcolorshift); + if (!pedited || pedited->vibrance.pastsattog) keyFile.set_boolean ("Vibrance", "PastSatTog", vibrance.pastsattog); //save edge sharpening - if (pedited->sharpenEdge.enabled) keyFile.set_boolean ("SharpenEdge", "Enabled", sharpenEdge.enabled); - if (pedited->sharpenEdge.passes) keyFile.set_integer ("SharpenEdge", "Passes", sharpenEdge.passes); - if (pedited->sharpenEdge.amount) keyFile.set_double ("SharpenEdge", "Strength", sharpenEdge.amount); - if (pedited->sharpenEdge.threechannels) keyFile.set_boolean ("SharpenEdge", "ThreeChannels", sharpenEdge.threechannels); + if (!pedited || pedited->sharpenEdge.enabled) keyFile.set_boolean ("SharpenEdge", "Enabled", sharpenEdge.enabled); + if (!pedited || pedited->sharpenEdge.passes) keyFile.set_integer ("SharpenEdge", "Passes", sharpenEdge.passes); + if (!pedited || pedited->sharpenEdge.amount) keyFile.set_double ("SharpenEdge", "Strength", sharpenEdge.amount); + if (!pedited || pedited->sharpenEdge.threechannels) keyFile.set_boolean ("SharpenEdge", "ThreeChannels", sharpenEdge.threechannels); //save micro-contrast sharpening - if (pedited->sharpenMicro.enabled) keyFile.set_boolean ("SharpenMicro", "Enabled", sharpenMicro.enabled); - if (pedited->sharpenMicro.matrix) keyFile.set_boolean ("SharpenMicro", "Matrix", sharpenMicro.matrix); - if (pedited->sharpenMicro.amount) keyFile.set_double ("SharpenMicro", "Strength", sharpenMicro.amount); - if (pedited->sharpenMicro.uniformity) keyFile.set_double ("SharpenMicro", "Uniformity", sharpenMicro.uniformity); + if (!pedited || pedited->sharpenMicro.enabled) keyFile.set_boolean ("SharpenMicro", "Enabled", sharpenMicro.enabled); + if (!pedited || pedited->sharpenMicro.matrix) keyFile.set_boolean ("SharpenMicro", "Matrix", sharpenMicro.matrix); + if (!pedited || pedited->sharpenMicro.amount) keyFile.set_double ("SharpenMicro", "Strength", sharpenMicro.amount); + if (!pedited || pedited->sharpenMicro.uniformity) keyFile.set_double ("SharpenMicro", "Uniformity", sharpenMicro.uniformity); /* // save colorBoost - if (pedited->colorBoost.amount) keyFile.set_integer ("Color Boost", "Amount", colorBoost.amount); - if (pedited->colorBoost.avoidclip) keyFile.set_boolean ("Color Boost", "AvoidColorClipping", colorBoost.avoidclip); - if (pedited->colorBoost.enable_saturationlimiter) keyFile.set_boolean ("Color Boost", "SaturationLimiter", colorBoost.enable_saturationlimiter); - if (pedited->colorBoost.saturationlimit) keyFile.set_double ("Color Boost", "SaturationLimit", colorBoost.saturationlimit); + if (!pedited || pedited->colorBoost.amount) keyFile.set_integer ("Color Boost", "Amount", colorBoost.amount); + if (!pedited || pedited->colorBoost.avoidclip) keyFile.set_boolean ("Color Boost", "AvoidColorClipping", colorBoost.avoidclip); + if (!pedited || pedited->colorBoost.enable_saturationlimiter) keyFile.set_boolean ("Color Boost", "SaturationLimiter", colorBoost.enable_saturationlimiter); + if (!pedited || pedited->colorBoost.saturationlimit) keyFile.set_double ("Color Boost", "SaturationLimit", colorBoost.saturationlimit); */ // save wb - if (pedited->wb.method) keyFile.set_string ("White Balance", "Setting", wb.method); - if (pedited->wb.temperature) keyFile.set_integer ("White Balance", "Temperature", wb.temperature); - if (pedited->wb.green) keyFile.set_double ("White Balance", "Green", wb.green); + if (!pedited || pedited->wb.method) keyFile.set_string ("White Balance", "Setting", wb.method); + if (!pedited || pedited->wb.temperature) keyFile.set_integer ("White Balance", "Temperature", wb.temperature); + if (!pedited || pedited->wb.green) keyFile.set_double ("White Balance", "Green", wb.green); /* // save colorShift - if (pedited->colorShift.a) keyFile.set_double ("Color Shift", "ChannelA", colorShift.a); - if (pedited->colorShift.b) keyFile.set_double ("Color Shift", "ChannelB", colorShift.b); + if (!pedited || pedited->colorShift.a) keyFile.set_double ("Color Shift", "ChannelA", colorShift.a); + if (!pedited || pedited->colorShift.b) keyFile.set_double ("Color Shift", "ChannelB", colorShift.b); */ // save impulseDenoise - if (pedited->impulseDenoise.enabled) keyFile.set_boolean ("Impulse Denoising", "Enabled", impulseDenoise.enabled); - if (pedited->impulseDenoise.thresh) keyFile.set_integer ("Impulse Denoising", "Threshold", impulseDenoise.thresh); + if (!pedited || pedited->impulseDenoise.enabled) keyFile.set_boolean ("Impulse Denoising", "Enabled", impulseDenoise.enabled); + if (!pedited || pedited->impulseDenoise.thresh) keyFile.set_integer ("Impulse Denoising", "Threshold", impulseDenoise.thresh); // save defringe - if (pedited->defringe.enabled) keyFile.set_boolean ("Defringing", "Enabled", defringe.enabled); - if (pedited->defringe.radius) keyFile.set_double ("Defringing", "Radius", defringe.radius); - if (pedited->defringe.threshold) keyFile.set_integer ("Defringing", "Threshold", defringe.threshold); + if (!pedited || pedited->defringe.enabled) keyFile.set_boolean ("Defringing", "Enabled", defringe.enabled); + if (!pedited || pedited->defringe.radius) keyFile.set_double ("Defringing", "Radius", defringe.radius); + if (!pedited || pedited->defringe.threshold) keyFile.set_integer ("Defringing", "Threshold", defringe.threshold); // save dirpyrDenoise - if (pedited->dirpyrDenoise.enabled) keyFile.set_boolean ("Directional Pyramid Denoising", "Enabled", dirpyrDenoise.enabled); - if (pedited->dirpyrDenoise.luma) keyFile.set_integer ("Directional Pyramid Denoising", "Luma", dirpyrDenoise.luma); - if (pedited->dirpyrDenoise.chroma) keyFile.set_integer ("Directional Pyramid Denoising", "Chroma", dirpyrDenoise.chroma); - if (pedited->dirpyrDenoise.gamma) keyFile.set_double ("Directional Pyramid Denoising", "Gamma", dirpyrDenoise.gamma); + if (!pedited || pedited->dirpyrDenoise.enabled) keyFile.set_boolean ("Directional Pyramid Denoising", "Enabled", dirpyrDenoise.enabled); + if (!pedited || pedited->dirpyrDenoise.luma) keyFile.set_integer ("Directional Pyramid Denoising", "Luma", dirpyrDenoise.luma); + if (!pedited || pedited->dirpyrDenoise.chroma) keyFile.set_integer ("Directional Pyramid Denoising", "Chroma", dirpyrDenoise.chroma); + if (!pedited || pedited->dirpyrDenoise.gamma) keyFile.set_double ("Directional Pyramid Denoising", "Gamma", dirpyrDenoise.gamma); //Save edgePreservingDecompositionUI. - if (pedited->edgePreservingDecompositionUI.enabled) keyFile.set_boolean ("EPD", "Enabled", edgePreservingDecompositionUI.enabled); - if (pedited->edgePreservingDecompositionUI.Strength) keyFile.set_double ("EPD", "Strength", edgePreservingDecompositionUI.Strength); - if (pedited->edgePreservingDecompositionUI.EdgeStopping) keyFile.set_double ("EPD", "EdgeStopping", edgePreservingDecompositionUI.EdgeStopping); - if (pedited->edgePreservingDecompositionUI.Scale) keyFile.set_double ("EPD", "Scale", edgePreservingDecompositionUI.Scale); - if (pedited->edgePreservingDecompositionUI.ReweightingIterates) keyFile.set_integer ("EPD", "ReweightingIterates", edgePreservingDecompositionUI.ReweightingIterates); + if (!pedited || pedited->edgePreservingDecompositionUI.enabled) keyFile.set_boolean ("EPD", "Enabled", edgePreservingDecompositionUI.enabled); + if (!pedited || pedited->edgePreservingDecompositionUI.Strength) keyFile.set_double ("EPD", "Strength", edgePreservingDecompositionUI.Strength); + if (!pedited || pedited->edgePreservingDecompositionUI.EdgeStopping) keyFile.set_double ("EPD", "EdgeStopping", edgePreservingDecompositionUI.EdgeStopping); + if (!pedited || pedited->edgePreservingDecompositionUI.Scale) keyFile.set_double ("EPD", "Scale", edgePreservingDecompositionUI.Scale); + if (!pedited || pedited->edgePreservingDecompositionUI.ReweightingIterates) keyFile.set_integer ("EPD", "ReweightingIterates", edgePreservingDecompositionUI.ReweightingIterates); /* // save lumaDenoise - if (pedited->lumaDenoise.enabled) keyFile.set_boolean ("Luminance Denoising", "Enabled", lumaDenoise.enabled); - if (pedited->lumaDenoise.radius) keyFile.set_double ("Luminance Denoising", "Radius", lumaDenoise.radius); - if (pedited->lumaDenoise.edgetolerance) keyFile.set_integer ("Luminance Denoising", "EdgeTolerance", lumaDenoise.edgetolerance); + if (!pedited || pedited->lumaDenoise.enabled) keyFile.set_boolean ("Luminance Denoising", "Enabled", lumaDenoise.enabled); + if (!pedited || pedited->lumaDenoise.radius) keyFile.set_double ("Luminance Denoising", "Radius", lumaDenoise.radius); + if (!pedited || pedited->lumaDenoise.edgetolerance) keyFile.set_integer ("Luminance Denoising", "EdgeTolerance", lumaDenoise.edgetolerance); */ /* // save colorDenoise - //if (pedited->colorDenoise.enabled) keyFile.set_boolean ("Chrominance Denoising", "Enabled", colorDenoise.enabled); - if (pedited->colorDenoise.amount) keyFile.set_integer ("Chrominance Denoising", "Amount", colorDenoise.amount); + //if (!pedited || pedited->colorDenoise.enabled) keyFile.set_boolean ("Chrominance Denoising", "Enabled", colorDenoise.enabled); + if (!pedited || pedited->colorDenoise.amount) keyFile.set_integer ("Chrominance Denoising", "Amount", colorDenoise.amount); */ // save sh - if (pedited->sh.enabled) keyFile.set_boolean ("Shadows & Highlights", "Enabled", sh.enabled); - if (pedited->sh.hq) keyFile.set_boolean ("Shadows & Highlights", "HighQuality", sh.hq); - if (pedited->sh.highlights) keyFile.set_integer ("Shadows & Highlights", "Highlights", sh.highlights); - if (pedited->sh.htonalwidth) keyFile.set_integer ("Shadows & Highlights", "HighlightTonalWidth", sh.htonalwidth); - if (pedited->sh.shadows) keyFile.set_integer ("Shadows & Highlights", "Shadows", sh.shadows); - if (pedited->sh.stonalwidth) keyFile.set_integer ("Shadows & Highlights", "ShadowTonalWidth", sh.stonalwidth); - if (pedited->sh.localcontrast) keyFile.set_integer ("Shadows & Highlights", "LocalContrast", sh.localcontrast); - if (pedited->sh.radius) keyFile.set_integer ("Shadows & Highlights", "Radius", sh.radius); + if (!pedited || pedited->sh.enabled) keyFile.set_boolean ("Shadows & Highlights", "Enabled", sh.enabled); + if (!pedited || pedited->sh.hq) keyFile.set_boolean ("Shadows & Highlights", "HighQuality", sh.hq); + if (!pedited || pedited->sh.highlights) keyFile.set_integer ("Shadows & Highlights", "Highlights", sh.highlights); + if (!pedited || pedited->sh.htonalwidth) keyFile.set_integer ("Shadows & Highlights", "HighlightTonalWidth", sh.htonalwidth); + if (!pedited || pedited->sh.shadows) keyFile.set_integer ("Shadows & Highlights", "Shadows", sh.shadows); + if (!pedited || pedited->sh.stonalwidth) keyFile.set_integer ("Shadows & Highlights", "ShadowTonalWidth", sh.stonalwidth); + if (!pedited || pedited->sh.localcontrast) keyFile.set_integer ("Shadows & Highlights", "LocalContrast", sh.localcontrast); + if (!pedited || pedited->sh.radius) keyFile.set_integer ("Shadows & Highlights", "Radius", sh.radius); // save crop - if (pedited->crop.enabled) keyFile.set_boolean ("Crop", "Enabled", crop.enabled); - if (pedited->crop.x) keyFile.set_integer ("Crop", "X", crop.x); - if (pedited->crop.y) keyFile.set_integer ("Crop", "Y", crop.y); - if (pedited->crop.w) keyFile.set_integer ("Crop", "W", crop.w); - if (pedited->crop.h) keyFile.set_integer ("Crop", "H", crop.h); - if (pedited->crop.fixratio) keyFile.set_boolean ("Crop", "FixedRatio", crop.fixratio); - if (pedited->crop.ratio) keyFile.set_string ("Crop", "Ratio", crop.ratio); - if (pedited->crop.orientation) keyFile.set_string ("Crop", "Orientation", crop.orientation); - if (pedited->crop.guide) keyFile.set_string ("Crop", "Guide", crop.guide); + if (!pedited || pedited->crop.enabled) keyFile.set_boolean ("Crop", "Enabled", crop.enabled); + if (!pedited || pedited->crop.x) keyFile.set_integer ("Crop", "X", crop.x); + if (!pedited || pedited->crop.y) keyFile.set_integer ("Crop", "Y", crop.y); + if (!pedited || pedited->crop.w) keyFile.set_integer ("Crop", "W", crop.w); + if (!pedited || pedited->crop.h) keyFile.set_integer ("Crop", "H", crop.h); + if (!pedited || pedited->crop.fixratio) keyFile.set_boolean ("Crop", "FixedRatio", crop.fixratio); + if (!pedited || pedited->crop.ratio) keyFile.set_string ("Crop", "Ratio", crop.ratio); + if (!pedited || pedited->crop.orientation) keyFile.set_string ("Crop", "Orientation", crop.orientation); + if (!pedited || pedited->crop.guide) keyFile.set_string ("Crop", "Guide", crop.guide); // save coarse - if (pedited->coarse.rotate) keyFile.set_integer ("Coarse Transformation", "Rotate", coarse.rotate); - if (pedited->coarse.hflip) keyFile.set_boolean ("Coarse Transformation", "HorizontalFlip", coarse.hflip); - if (pedited->coarse.vflip) keyFile.set_boolean ("Coarse Transformation", "VerticalFlip", coarse.vflip); + if (!pedited || pedited->coarse.rotate) keyFile.set_integer ("Coarse Transformation", "Rotate", coarse.rotate); + if (!pedited || pedited->coarse.hflip) keyFile.set_boolean ("Coarse Transformation", "HorizontalFlip", coarse.hflip); + if (!pedited || pedited->coarse.vflip) keyFile.set_boolean ("Coarse Transformation", "VerticalFlip", coarse.vflip); // save commonTrans - if (pedited->commonTrans.autofill) keyFile.set_boolean ("Common Properties for Transformations", "AutoFill", commonTrans.autofill); + if (!pedited || pedited->commonTrans.autofill) keyFile.set_boolean ("Common Properties for Transformations", "AutoFill", commonTrans.autofill); // save rotate - if (pedited->rotate.degree) keyFile.set_double ("Rotation", "Degree", rotate.degree); + if (!pedited || pedited->rotate.degree) keyFile.set_double ("Rotation", "Degree", rotate.degree); // save distortion - if (pedited->distortion.amount) keyFile.set_double ("Distortion", "Amount", distortion.amount); - if (pedited->distortion.uselensfun) keyFile.set_boolean ("Distortion", "UseLensFun", distortion.uselensfun); + if (!pedited || pedited->distortion.amount) keyFile.set_double ("Distortion", "Amount", distortion.amount); + if (!pedited || pedited->distortion.uselensfun) keyFile.set_boolean ("Distortion", "UseLensFun", distortion.uselensfun); // save perspective correction - if (pedited->perspective.horizontal) keyFile.set_integer ("Perspective", "Horizontal", perspective.horizontal); - if (pedited->perspective.vertical) keyFile.set_integer ("Perspective", "Vertical", perspective.vertical); + if (!pedited || pedited->perspective.horizontal) keyFile.set_integer ("Perspective", "Horizontal", perspective.horizontal); + if (!pedited || pedited->perspective.vertical) keyFile.set_integer ("Perspective", "Vertical", perspective.vertical); // save C/A correction - if (pedited->cacorrection.red) keyFile.set_double ("CACorrection", "Red", cacorrection.red); - if (pedited->cacorrection.blue) keyFile.set_double ("CACorrection", "Blue", cacorrection.blue); + if (!pedited || pedited->cacorrection.red) keyFile.set_double ("CACorrection", "Red", cacorrection.red); + if (!pedited || pedited->cacorrection.blue) keyFile.set_double ("CACorrection", "Blue", cacorrection.blue); // save vignetting correction - if (pedited->vignetting.amount) keyFile.set_integer ("Vignetting Correction", "Amount", vignetting.amount); - if (pedited->vignetting.radius) keyFile.set_integer ("Vignetting Correction", "Radius", vignetting.radius); - if (pedited->vignetting.strength) keyFile.set_integer ("Vignetting Correction", "Strength", vignetting.strength); - if (pedited->vignetting.centerX) keyFile.set_integer ("Vignetting Correction", "CenterX", vignetting.centerX); - if (pedited->vignetting.centerY) keyFile.set_integer ("Vignetting Correction", "CenterY", vignetting.centerY); + if (!pedited || pedited->vignetting.amount) keyFile.set_integer ("Vignetting Correction", "Amount", vignetting.amount); + if (!pedited || pedited->vignetting.radius) keyFile.set_integer ("Vignetting Correction", "Radius", vignetting.radius); + if (!pedited || pedited->vignetting.strength) keyFile.set_integer ("Vignetting Correction", "Strength", vignetting.strength); + if (!pedited || pedited->vignetting.centerX) keyFile.set_integer ("Vignetting Correction", "CenterX", vignetting.centerX); + if (!pedited || pedited->vignetting.centerY) keyFile.set_integer ("Vignetting Correction", "CenterY", vignetting.centerY); // save highlight recovery settings - if (pedited->hlrecovery.enabled) keyFile.set_boolean ("HLRecovery", "Enabled", hlrecovery.enabled); - if (pedited->hlrecovery.method) keyFile.set_string ("HLRecovery", "Method", hlrecovery.method); + if (!pedited || pedited->hlrecovery.enabled) keyFile.set_boolean ("HLRecovery", "Enabled", hlrecovery.enabled); + if (!pedited || pedited->hlrecovery.method) keyFile.set_string ("HLRecovery", "Method", hlrecovery.method); - if (pedited->resize.enabled) keyFile.set_boolean ("Resize", "Enabled",resize.enabled); - if (pedited->resize.scale) keyFile.set_double ("Resize", "Scale", resize.scale); - if (pedited->resize.appliesTo) keyFile.set_string ("Resize", "AppliesTo", resize.appliesTo); - if (pedited->resize.method) keyFile.set_string ("Resize", "Method", resize.method); - if (pedited->resize.dataspec) keyFile.set_integer ("Resize", "DataSpecified", resize.dataspec); - if (pedited->resize.width) keyFile.set_integer ("Resize", "Width", resize.width); - if (pedited->resize.height) keyFile.set_integer ("Resize", "Height", resize.height); + if (!pedited || pedited->resize.enabled) keyFile.set_boolean ("Resize", "Enabled",resize.enabled); + if (!pedited || pedited->resize.scale) keyFile.set_double ("Resize", "Scale", resize.scale); + if (!pedited || pedited->resize.appliesTo) keyFile.set_string ("Resize", "AppliesTo", resize.appliesTo); + if (!pedited || pedited->resize.method) keyFile.set_string ("Resize", "Method", resize.method); + if (!pedited || pedited->resize.dataspec) keyFile.set_integer ("Resize", "DataSpecified", resize.dataspec); + if (!pedited || pedited->resize.width) keyFile.set_integer ("Resize", "Width", resize.width); + if (!pedited || pedited->resize.height) keyFile.set_integer ("Resize", "Height", resize.height); // save color management settings - if (pedited->icm.input) keyFile.set_string ("Color Management", "InputProfile", icm.input); - if (pedited->icm.blendCMSMatrix) keyFile.set_boolean ("Color Management", "BlendCMSMatrix", icm.blendCMSMatrix); - if (pedited->icm.preferredProfile) keyFile.set_boolean ("Color Management", "PreferredProfile", icm.preferredProfile); - if (pedited->icm.working) keyFile.set_string ("Color Management", "WorkingProfile", icm.working); - if (pedited->icm.output) keyFile.set_string ("Color Management", "OutputProfile", icm.output); - if (pedited->icm.gamma) keyFile.set_string ("Color Management", "Gammafree", icm.gamma); - if (pedited->icm.freegamma) keyFile.set_boolean ("Color Management", "Freegamma", icm.freegamma); - if (pedited->icm.gampos) keyFile.set_double ("Color Management", "GammaValue", icm.gampos); - if (pedited->icm.slpos) keyFile.set_double ("Color Management", "GammaSlope", icm.slpos); + if (!pedited || pedited->icm.input) keyFile.set_string ("Color Management", "InputProfile", icm.input); + if (!pedited || pedited->icm.blendCMSMatrix) keyFile.set_boolean ("Color Management", "BlendCMSMatrix", icm.blendCMSMatrix); + if (!pedited || pedited->icm.preferredProfile) keyFile.set_boolean ("Color Management", "PreferredProfile", icm.preferredProfile); + if (!pedited || pedited->icm.working) keyFile.set_string ("Color Management", "WorkingProfile", icm.working); + if (!pedited || pedited->icm.output) keyFile.set_string ("Color Management", "OutputProfile", icm.output); + if (!pedited || pedited->icm.gamma) keyFile.set_string ("Color Management", "Gammafree", icm.gamma); + if (!pedited || pedited->icm.freegamma) keyFile.set_boolean ("Color Management", "Freegamma", icm.freegamma); + if (!pedited || pedited->icm.gampos) keyFile.set_double ("Color Management", "GammaValue", icm.gampos); + if (!pedited || pedited->icm.slpos) keyFile.set_double ("Color Management", "GammaSlope", icm.slpos); // save directional pyramid equalizer parameters - if (pedited->dirpyrequalizer.enabled) keyFile.set_boolean ("Directional Pyramid Equalizer", "Enabled", dirpyrequalizer.enabled); + if (!pedited || pedited->dirpyrequalizer.enabled) keyFile.set_boolean ("Directional Pyramid Equalizer", "Enabled", dirpyrequalizer.enabled); for(int i = 0; i < 5; i++) { std::stringstream ss; ss << "Mult" << i; - if (pedited->dirpyrequalizer.mult[i]) keyFile.set_double("Directional Pyramid Equalizer", ss.str(), dirpyrequalizer.mult[i]); + if (!pedited || pedited->dirpyrequalizer.mult[i]) keyFile.set_double("Directional Pyramid Equalizer", ss.str(), dirpyrequalizer.mult[i]); } // save hsv equalizer parameters - if (pedited->hsvequalizer.hcurve) { + if (!pedited || pedited->hsvequalizer.hcurve) { Glib::ArrayHandle hcurve = hsvequalizer.hcurve; keyFile.set_double_list("HSV Equalizer", "HCurve", hcurve); } - if (pedited->hsvequalizer.scurve) { + if (!pedited || pedited->hsvequalizer.scurve) { Glib::ArrayHandle scurve = hsvequalizer.scurve; keyFile.set_double_list("HSV Equalizer", "SCurve", scurve); } - if (pedited->hsvequalizer.vcurve) { + if (!pedited || pedited->hsvequalizer.vcurve) { Glib::ArrayHandle vcurve = hsvequalizer.vcurve; keyFile.set_double_list("HSV Equalizer", "VCurve", vcurve); } - if (pedited->rgbCurves.rcurve) { + if (!pedited || pedited->rgbCurves.rcurve) { Glib::ArrayHandle RGBrcurve = rgbCurves.rcurve; keyFile.set_double_list("RGB Curves", "rCurve", RGBrcurve); } - if (pedited->rgbCurves.gcurve) { + if (!pedited || pedited->rgbCurves.gcurve) { Glib::ArrayHandle RGBgcurve = rgbCurves.gcurve; keyFile.set_double_list("RGB Curves", "gCurve", RGBgcurve); } - if (pedited->rgbCurves.bcurve) { + if (!pedited || pedited->rgbCurves.bcurve) { Glib::ArrayHandle RGBbcurve = rgbCurves.bcurve; keyFile.set_double_list("RGB Curves", "bCurve", RGBbcurve); } // save raw parameters - if (pedited->raw.darkFrame) keyFile.set_string ("RAW", "DarkFrame", raw.dark_frame ); - if (pedited->raw.dfAuto) keyFile.set_boolean ("RAW", "DarkFrameAuto", raw.df_autoselect ); - if (pedited->raw.ff_file) keyFile.set_string ("RAW", "FlatFieldFile", raw.ff_file ); - if (pedited->raw.ff_AutoSelect) keyFile.set_boolean ("RAW", "FlatFieldAutoSelect", raw.ff_AutoSelect ); - if (pedited->raw.ff_BlurRadius) keyFile.set_integer ("RAW", "FlatFieldBlurRadius", raw.ff_BlurRadius ); - if (pedited->raw.ff_BlurType) keyFile.set_string ("RAW", "FlatFieldBlurType", raw.ff_BlurType ); - if (pedited->raw.caCorrection) keyFile.set_boolean ("RAW", "CA", raw.ca_autocorrect ); - if (pedited->raw.caRed) keyFile.set_double ("RAW", "CARed", raw.cared ); - if (pedited->raw.caBlue) keyFile.set_double ("RAW", "CABlue", raw.cablue ); - if (pedited->raw.hotDeadPixelFilter) keyFile.set_boolean ("RAW", "HotDeadPixels", raw.hotdeadpix_filt ); - if (pedited->raw.hotDeadPixelThresh) keyFile.set_integer ("RAW", "HotDeadPixelThresh", raw.hotdeadpix_thresh ); - if (pedited->raw.linenoise) keyFile.set_integer ("RAW", "LineDenoise", raw.linenoise); - if (pedited->raw.greenEq) keyFile.set_integer ("RAW", "GreenEqThreshold", raw.greenthresh); - if (pedited->raw.ccSteps) keyFile.set_integer ("RAW", "CcSteps", raw.ccSteps); - if (pedited->raw.dmethod) keyFile.set_string ("RAW", "Method", raw.dmethod ); - if (pedited->raw.dcbIterations) keyFile.set_integer ("RAW", "DCBIterations", raw.dcb_iterations ); - if (pedited->raw.dcbEnhance) keyFile.set_boolean ("RAW", "DCBEnhance", raw.dcb_enhance ); - if (pedited->raw.allEnhance) keyFile.set_boolean ("RAW", "ALLEnhance", raw.all_enhance ); + if (!pedited || pedited->raw.darkFrame) keyFile.set_string ("RAW", "DarkFrame", raw.dark_frame ); + if (!pedited || pedited->raw.dfAuto) keyFile.set_boolean ("RAW", "DarkFrameAuto", raw.df_autoselect ); + if (!pedited || pedited->raw.ff_file) keyFile.set_string ("RAW", "FlatFieldFile", raw.ff_file ); + if (!pedited || pedited->raw.ff_AutoSelect) keyFile.set_boolean ("RAW", "FlatFieldAutoSelect", raw.ff_AutoSelect ); + if (!pedited || pedited->raw.ff_BlurRadius) keyFile.set_integer ("RAW", "FlatFieldBlurRadius", raw.ff_BlurRadius ); + if (!pedited || pedited->raw.ff_BlurType) keyFile.set_string ("RAW", "FlatFieldBlurType", raw.ff_BlurType ); + if (!pedited || pedited->raw.caCorrection) keyFile.set_boolean ("RAW", "CA", raw.ca_autocorrect ); + if (!pedited || pedited->raw.caRed) keyFile.set_double ("RAW", "CARed", raw.cared ); + if (!pedited || pedited->raw.caBlue) keyFile.set_double ("RAW", "CABlue", raw.cablue ); + if (!pedited || pedited->raw.hotDeadPixelFilter) keyFile.set_boolean ("RAW", "HotDeadPixels", raw.hotdeadpix_filt ); + if (!pedited || pedited->raw.hotDeadPixelThresh) keyFile.set_integer ("RAW", "HotDeadPixelThresh", raw.hotdeadpix_thresh ); + if (!pedited || pedited->raw.linenoise) keyFile.set_integer ("RAW", "LineDenoise", raw.linenoise); + if (!pedited || pedited->raw.greenEq) keyFile.set_integer ("RAW", "GreenEqThreshold", raw.greenthresh); + if (!pedited || pedited->raw.ccSteps) keyFile.set_integer ("RAW", "CcSteps", raw.ccSteps); + if (!pedited || pedited->raw.dmethod) keyFile.set_string ("RAW", "Method", raw.dmethod ); + if (!pedited || pedited->raw.dcbIterations) keyFile.set_integer ("RAW", "DCBIterations", raw.dcb_iterations ); + if (!pedited || pedited->raw.dcbEnhance) keyFile.set_boolean ("RAW", "DCBEnhance", raw.dcb_enhance ); + if (!pedited || pedited->raw.allEnhance) keyFile.set_boolean ("RAW", "ALLEnhance", raw.all_enhance ); // save raw exposition - if (pedited->raw.exPos) keyFile.set_double ("RAW", "PreExposure", raw.expos ); - if (pedited->raw.exPreser) keyFile.set_double ("RAW", "PrePreserv", raw.preser ); - if (pedited->raw.exBlackzero) keyFile.set_double ("RAW", "PreBlackzero", raw.blackzero ); - if (pedited->raw.exBlackone) keyFile.set_double ("RAW", "PreBlackone", raw.blackone ); - if (pedited->raw.exBlacktwo) keyFile.set_double ("RAW", "PreBlacktwo", raw.blacktwo ); - if (pedited->raw.exBlackthree) keyFile.set_double ("RAW", "PreBlackthree", raw.blackthree ); - if (pedited->raw.exTwoGreen) keyFile.set_boolean ("RAW", "PreTwoGreen", raw.twogreen ); + if (!pedited || pedited->raw.exPos) keyFile.set_double ("RAW", "PreExposure", raw.expos ); + if (!pedited || pedited->raw.exPreser) keyFile.set_double ("RAW", "PrePreserv", raw.preser ); + if (!pedited || pedited->raw.exBlackzero) keyFile.set_double ("RAW", "PreBlackzero", raw.blackzero ); + if (!pedited || pedited->raw.exBlackone) keyFile.set_double ("RAW", "PreBlackone", raw.blackone ); + if (!pedited || pedited->raw.exBlacktwo) keyFile.set_double ("RAW", "PreBlacktwo", raw.blacktwo ); + if (!pedited || pedited->raw.exBlackthree) keyFile.set_double ("RAW", "PreBlackthree", raw.blackthree ); + if (!pedited || pedited->raw.exTwoGreen) keyFile.set_boolean ("RAW", "PreTwoGreen", raw.twogreen ); // save exif change list - if (pedited->exif) { - for (ExifPairs::const_iterator i=exif.begin(); i!=exif.end(); ++i) + if (!pedited || pedited->exif) { + for (ExifPairs::const_iterator i=exif.begin(); i!=exif.end(); i++) keyFile.set_string ("Exif", i->first, i->second); } // save iptc change list - if (pedited->iptc) { - for (IPTCPairs::const_iterator i=iptc.begin(); i!=iptc.end(); ++i) { + if (!pedited || pedited->iptc) { + for (IPTCPairs::const_iterator i=iptc.begin(); i!=iptc.end(); i++) { Glib::ArrayHandle values = i->second; keyFile.set_string_list ("IPTC", i->first, values); } } - } Glib::ustring sPParams = keyFile.to_data(); @@ -672,7 +670,7 @@ int ProcParams::save (Glib::ustring fname, Glib::ustring fname2, ParamsEdited* p int ProcParams::write (Glib::ustring &fname, Glib::ustring &content) const { int error = 0; - if (!fname.empty()) { + if (fname.length()) { FILE *f; f = safe_g_fopen (fname, "wt"); @@ -1055,7 +1053,7 @@ if (keyFile.has_group ("RAW")) { // load exif change settings if (keyFile.has_group ("Exif")) { std::vector keys = keyFile.get_keys ("Exif"); - for (size_t i=0; iexif = true; @@ -1077,7 +1075,7 @@ if (keyFile.has_group ("Exif")) { if (keyFile.has_group ("IPTC")) { std::vector keys = keyFile.get_keys ("IPTC"); IPTCPairs::iterator element; - for (size_t i=0; i currIptc = keyFile.get_string_list ("IPTC", keys[i]); for ( - std::vector::const_iterator currLoadedTagValue=currIptc.begin(); + std::vector::iterator currLoadedTagValue=currIptc.begin(); currLoadedTagValue!=currIptc.end(); - ++currLoadedTagValue) + currLoadedTagValue++) { iptc[keys[i]].push_back(currLoadedTagValue->data()); } @@ -1133,7 +1131,7 @@ bool operator==(const IPTCPairs& a, const IPTCPairs& b) { return a.field == b.field && a.values == b.values; }*/ -bool ProcParams::operator== (const ProcParams& other) const { +bool ProcParams::operator== (const ProcParams& other) { return toneCurve.curve == other.toneCurve.curve @@ -1304,7 +1302,7 @@ bool ProcParams::operator== (const ProcParams& other) const { } -bool ProcParams::operator!= (const ProcParams& other) const { +bool ProcParams::operator!= (const ProcParams& other) { return !(*this==other); } diff --git a/rtengine/procparams.h b/rtengine/procparams.h index 0648172e9..ec0025d73 100644 --- a/rtengine/procparams.h +++ b/rtengine/procparams.h @@ -583,8 +583,8 @@ class ProcParams { static void init (); static void cleanup (); - bool operator== (const ProcParams& other) const; - bool operator!= (const ProcParams& other) const; + bool operator== (const ProcParams& other); + bool operator!= (const ProcParams& other); private: /** Write the ProcParams's text in the file of the given name. diff --git a/rtengine/rawimage.h b/rtengine/rawimage.h index 659a1cbf6..867ecffea 100644 --- a/rtengine/rawimage.h +++ b/rtengine/rawimage.h @@ -53,7 +53,7 @@ public: int height() const { return h; } // if a pixel is set returns true - bool get(int x, int y) const + bool get(int x, int y) { return (pm[y*w+ x/(base_t_size*8) ] & (base_t)1<<(x%(base_t_size*8)) )!=0; } @@ -68,7 +68,7 @@ public: int set( std::list &bp) { int totSet=0; - for(std::list::iterator iter = bp.begin(); iter != bp.end(); ++iter,++totSet) + for(std::list::iterator iter = bp.begin(); iter != bp.end(); iter++,totSet++) set( iter->x,iter->y); return totSet; } @@ -77,7 +77,7 @@ public: memset(pm,0,h * w *base_t_size ); } // return 0 if at least one pixel in the word(base_t) is set, otherwise return the number of pixels to skip to the next word base_t - int skipIfZero(int x, int y) const { + int skipIfZero(int x, int y){ return pm[y*w+ x/(base_t_size*8) ]==0 ? base_t_size*8 -x%(base_t_size*8):0; } }; @@ -97,7 +97,7 @@ public: filters &= ~((filters & 0x55555555) << 1); } } - dcrawImage_t get_image() const { return image; } + dcrawImage_t get_image() { return image; } unsigned short** compress_image(); // revert to compressed pixels format and release image data unsigned short** data; // holds pixel values, data[i][j] corresponds to the ith row and jth column unsigned prefilters; // original filters saved ( used for 4 color processing ) @@ -141,12 +141,12 @@ public: char* get_profile() const { return profile_data;} IMFILE *get_file() { return ifp; } bool is_supportedThumb() const ; - int get_thumbOffset() const { return int(thumb_offset);} - int get_thumbWidth() const { return int(thumb_width);} - int get_thumbHeight() const { return int(thumb_height);} - int get_thumbBPS() const { return thumb_load_raw ? 16 : 8; } + int get_thumbOffset(){ return int(thumb_offset);} + int get_thumbWidth(){ return int(thumb_width);} + int get_thumbHeight(){ return int(thumb_height);} + int get_thumbBPS(){ return thumb_load_raw ? 16 : 8; } bool get_thumbSwap() const; - unsigned get_thumbLength() const {return thumb_length;} + unsigned get_thumbLength(){ return thumb_length;} public: // dcraw functions void scale_colors(){ DCraw::scale_colors(); } diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc index cded11b15..4c1dc0dba 100644 --- a/rtengine/rawimagesource.cc +++ b/rtengine/rawimagesource.cc @@ -255,7 +255,7 @@ void RawImageSource::getImage (ColorTemp ctemp, int tran, Imagefloat* image, Pre - //if (hrp.enabled && hrp.method=="Color" && hrmap[0]==NULL) + //if (hrp.enabled==true && hrp.method=="Color" && hrmap[0]==NULL) // updateHLRecoveryMap_ColorPropagation (); // compute image area to render in order to provide the requested part of the image @@ -541,7 +541,7 @@ int RawImageSource::findHotDeadPixel( PixelsMap &bpMap, float thresh) return counter; } -void RawImageSource::rotateLine (float* line, float** channel, int tran, int i, int w, int h) const { +void RawImageSource::rotateLine (float* line, float** channel, int tran, int i, int w, int h) { if ((tran & TR_ROT) == TR_R180) for (int j=0; jwidth; int height = image->height; @@ -1994,7 +1994,7 @@ bool RawImageSource::findInputProfile(Glib::ustring inProfile, cmsHPROFILE embed // DCPs have higher quality, so use them first *dcpProf=dcpStore->getStdProfile(camName); if (*dcpProf==NULL) in = iccStore->getStdProfile(camName); - } else if (inProfile!="(camera)" && !inProfile.empty()) { + } else if (inProfile!="(camera)" && inProfile!="") { Glib::ustring normalName=inProfile; if (!inProfile.compare (0, 5, "file:")) normalName=inProfile.substr(5); @@ -2435,7 +2435,7 @@ void RawImageSource::getRowStartEnd (int x, int &start, int &end) { int x; int y; double reds = 0, greens = 0, blues = 0; - unsigned int rn = 0; + int rn = 0; if (!ri->isBayer()) { int xmin, xmax, ymin, ymax; diff --git a/rtengine/rawimagesource.h b/rtengine/rawimagesource.h index 555bf8768..5e49d15d4 100644 --- a/rtengine/rawimagesource.h +++ b/rtengine/rawimagesource.h @@ -119,7 +119,7 @@ class RawImageSource : public ImageSource { void processFalseColorCorrectionThread (Imagefloat* im, int row_from, int row_to); void hlRecovery (std::string method, float* red, float* green, float* blue, int i, int sx1, int width, int skip, const RAWParams &raw, float* hlmax); int defTransform (int tran); - void rotateLine (float* line, float** channel, int tran, int i, int w, int h) const; + void rotateLine (float* line, float** channel, int tran, int i, int w, int h); void transformRect (PreviewProps pp, int tran, int &sx1, int &sy1, int &width, int &height, int &fw); void transformPosition (int x, int y, int tran, int& tx, int& ty); @@ -185,17 +185,17 @@ class RawImageSource : public ImageSource { protected: typedef unsigned short ushort; void processFalseColorCorrection (Imagefloat* i, int steps); - inline void convert_row_to_YIQ (float* r, float* g, float* b, float* Y, float* I, float* Q, int W) const; - inline void convert_row_to_RGB (float* r, float* g, float* b, float* Y, float* I, float* Q, int W) const; + inline void convert_row_to_YIQ (float* r, float* g, float* b, float* Y, float* I, float* Q, int W); + inline void convert_row_to_RGB (float* r, float* g, float* b, float* Y, float* I, float* Q, int W); - inline void convert_to_cielab_row (float* ar, float* ag, float* ab, float* oL, float* oa, float* ob) const; + inline void convert_to_cielab_row (float* ar, float* ag, float* ab, float* oL, float* oa, float* ob); inline void interpolate_row_g (float* agh, float* agv, int i); inline void interpolate_row_rb (float* ar, float* ab, float* pg, float* cg, float* ng, int i); inline void interpolate_row_rb_mul_pp (float* ar, float* ab, float* pg, float* cg, float* ng, int i, double r_mul, double g_mul, double b_mul, int x1, int width, int skip); int LinEqSolve( int nDim, float* pfMatr, float* pfVect, float* pfSolution);//Emil's CA auto correction void CA_correct_RT (double cared, double cablue); - void ddct8x8s(int isgn, float **a) const; + void ddct8x8s(int isgn, float **a); void processRawWhitepoint (float expos, float preser); // exposure before interpolation int cfaCleanFromMap( PixelsMap &bitmapBads ); @@ -215,10 +215,10 @@ class RawImageSource : public ImageSource { void dcb_demosaic(int iterations, bool dcb_enhance); void ahd_demosaic(int winx, int winy, int winw, int winh); void border_interpolate(int border, float (*image)[4], int start = 0, int end = 0); - void dcb_initTileLimits(int &colMin, int &rowMin, int &colMax, int &rowMax, int x0, int y0, int border) const; + void dcb_initTileLimits(int &colMin, int &rowMin, int &colMax, int &rowMax, int x0, int y0, int border); void fill_raw( float (*cache )[4], int x0, int y0, float** rawData); void fill_border( float (*cache )[4], int border, int x0, int y0); - void copy_to_buffer(float (*image2)[3], float (*image)[4]) const; + void copy_to_buffer(float (*image2)[3], float (*image)[4]); void dcb_hid(float (*image)[4], float (*bufferH)[3], float (*bufferV)[3], int x0, int y0); void dcb_color(float (*image)[4], int x0, int y0); void dcb_hid2(float (*image)[4], int x0, int y0); @@ -226,13 +226,13 @@ class RawImageSource : public ImageSource { void dcb_correction(float (*image)[4], int x0, int y0); void dcb_pp(float (*image)[4], int x0, int y0); void dcb_correction2(float (*image)[4], int x0, int y0); - void restore_from_buffer(float (*image)[4], float (*image2)[3]) const; + void restore_from_buffer(float (*image)[4], float (*image2)[3]); void dcb_refinement(float (*image)[4], int x0, int y0); void dcb_color_full(float (*image)[4], int x0, int y0, float (*chroma)[2]); void transLine (float* red, float* green, float* blue, int i, Imagefloat* image, int tran, int imw, int imh, int fw); void hflip (Imagefloat* im); - void vflip (Imagefloat* im) const; + void vflip (Imagefloat* im); }; } diff --git a/rtengine/rawimagesource_i.h b/rtengine/rawimagesource_i.h index c7014c066..30e3ef633 100644 --- a/rtengine/rawimagesource_i.h +++ b/rtengine/rawimagesource_i.h @@ -26,7 +26,7 @@ namespace rtengine { -inline void RawImageSource::convert_row_to_YIQ (float* r, float* g, float* b, float* Y, float* I, float* Q, int W) const { +inline void RawImageSource::convert_row_to_YIQ (float* r, float* g, float* b, float* Y, float* I, float* Q, int W) { for (int j=0; jwidth; int H = thumbImg->height; diff --git a/rtengine/rtthumbnail.h b/rtengine/rtthumbnail.h index 8de367e3b..da2a04cde 100644 --- a/rtengine/rtthumbnail.h +++ b/rtengine/rtthumbnail.h @@ -34,7 +34,7 @@ namespace rtengine { double cam2xyz[3][3]; - void transformPixel (int x, int y, int tran, int& tx, int& ty) const; + void transformPixel (int x, int y, int tran, int& tx, int& ty); static unsigned short *igammatab; static unsigned char *gammatab; @@ -72,7 +72,7 @@ namespace rtengine { IImage8* processImage (const procparams::ProcParams& pparams, int rheight, TypeInterpolation interp, std::string camName, double& scale); IImage8* quickProcessImage (const procparams::ProcParams& pparams, int rheight, TypeInterpolation interp, double& scale); - int getImageWidth (const procparams::ProcParams& pparams, int rheight, float &ratio) const; + int getImageWidth (const procparams::ProcParams& pparams, int rheight, float &ratio); void getDimensions (int& w, int& h, double& scaleFac); static Thumbnail* loadQuickFromRaw (const Glib::ustring& fname, rtengine::RawMetaDataLocation& rml, int &w, int &h, int fixwh, bool rotate); @@ -80,7 +80,7 @@ namespace rtengine { static Thumbnail* loadFromImage (const Glib::ustring& fname, int &w, int &h, int fixwh, int deg=0); void getCamWB (double& temp, double& green); - void getAutoWB (double& temp, double& green) const; + void getAutoWB (double& temp, double& green); void getSpotWB (const procparams::ProcParams& params, int x, int y, int rect, double& temp, double& green); void applyAutoExp (procparams::ProcParams& pparams); diff --git a/rtengine/safegtk.cc b/rtengine/safegtk.cc index 53d6dd61c..922c4c330 100644 --- a/rtengine/safegtk.cc +++ b/rtengine/safegtk.cc @@ -41,7 +41,7 @@ Glib::RefPtr safe_create_from_file(const Glib::ustring& filename) { Glib::RefPtr res; Glib::ustring path = RTImage::findIconAbsolutePath(filename); - if (!path.empty()) { + if (path.length()) { try { res = Gdk::Pixbuf::create_from_file (path); } @@ -56,7 +56,7 @@ Cairo::RefPtr safe_create_from_png(const Glib::ustring& fil { Cairo::RefPtr res; Glib::ustring path = RTImage::findIconAbsolutePath(filename); - if (!path.empty()) { + if (path.length()) { // files_test need a std::string which (as stated in its proto) but will only work if // we use the Glib::ustring filename !? try { diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc index b8eef1592..460379e61 100644 --- a/rtengine/simpleprocess.cc +++ b/rtengine/simpleprocess.cc @@ -281,7 +281,7 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p else if(j==7) chpro=options.rtSettings.srgb10;//gamma 1.0 else if(j==8) chpro=options.rtSettings.prophoto10;//gamma 1.0 - for (size_t i=0; iverbose) printf("Missing file: %s\n", chpro.c_str()); @@ -488,7 +488,7 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p else { // use RT_sRGB.icm profile if present, otherwise use LCMS2 profile generate by lab2rgb16b Glib::ustring outputProfile; - if (!params.icm.output.empty() && params.icm.output!=ColorManagementParams::NoICMString) { + if (params.icm.output!="" && params.icm.output!=ColorManagementParams::NoICMString) { outputProfile = params.icm.output; /* if we'd wanted the RT_sRGB profile we would have selected it diff --git a/rtengine/slicer.cc b/rtengine/slicer.cc index 7fc26449a..0a3eafece 100644 --- a/rtengine/slicer.cc +++ b/rtengine/slicer.cc @@ -95,7 +95,7 @@ Slicer::Slicer(unsigned int imageWidth, unsigned int imageHeight, Block *subRegi } // return the absolute position and size of the requested block -void Slicer::get_block(unsigned int numBlock, Block *block) const { +void Slicer::get_block(unsigned int numBlock, Block *block) { double roundingTradeOff = (hBlockNumber - (double)((int)hBlockNumber)) == 0.5 ? 2.1 : 2.0; unsigned int alreadyCompletedLineNbr = (unsigned int)((double)(numBlock) * blockWidth + (blockWidth/roundingTradeOff)); diff --git a/rtengine/slicer.h b/rtengine/slicer.h index 7122a1d15..ac27bca82 100644 --- a/rtengine/slicer.h +++ b/rtengine/slicer.h @@ -55,7 +55,7 @@ class Slicer { unsigned int blockNumber; // number of block for the sub-region unsigned int maxPixelNumber; // number of pixel of the biggest block (for memory allocation purpose) Slicer(unsigned int imageWidth, unsigned int imageHeight, Block *subRegion, unsigned int pixels); - void get_block(unsigned int blockId, Block *block) const; + void get_block(unsigned int blockId, Block *block); }; #endif diff --git a/rtengine/stdimagesource.cc b/rtengine/stdimagesource.cc index 06d677a6c..f9911de56 100644 --- a/rtengine/stdimagesource.cc +++ b/rtengine/stdimagesource.cc @@ -117,7 +117,7 @@ int StdImageSource::load (Glib::ustring fname, bool batch) { return 0; } -void StdImageSource::transform (PreviewProps pp, int tran, int &sx1, int &sy1, int &sx2, int &sy2) const { +void StdImageSource::transform (PreviewProps pp, int tran, int &sx1, int &sy1, int &sx2, int &sy2) { int W = img->width; int H = img->height; @@ -313,7 +313,7 @@ void StdImageSource::colorSpaceConversion (Imagefloat* im, ColorManagementParams cmsHPROFILE in; cmsHPROFILE out = iccStore->workingSpace (cmp.working); - if (cmp.input=="(embedded)" || cmp.input.empty() || cmp.input=="(camera)") { + if (cmp.input=="(embedded)" || cmp.input=="" || cmp.input=="(camera)") { if (embedded) in = embedded; else @@ -345,7 +345,7 @@ void StdImageSource::colorSpaceConversion16 (Image16* im, ColorManagementParams cmsHPROFILE in; cmsHPROFILE out = iccStore->workingSpace (cmp.working); - if (cmp.input=="(embedded)" || cmp.input.empty() || cmp.input=="(camera)") { + if (cmp.input=="(embedded)" || cmp.input=="" || cmp.input=="(camera)") { if (embedded) in = embedded; else @@ -409,7 +409,7 @@ void StdImageSource::hflip (Imagefloat* image) { delete [] rowb; } -void StdImageSource::vflip (Imagefloat* image) const { +void StdImageSource::vflip (Imagefloat* image) { int width = image->width; int height = image->height; @@ -468,7 +468,7 @@ ColorTemp StdImageSource::getAutoWB () { //return ColorTemp (pow(avg_r/n, 1.0/p), pow(avg_g/n, 1.0/p), pow(avg_b/n, 1.0/p)); } -void StdImageSource::transformPixel (int x, int y, int tran, int& tx, int& ty) const { +void StdImageSource::transformPixel (int x, int y, int tran, int& tx, int& ty) { int W = img->width; int H = img->height; diff --git a/rtengine/stdimagesource.h b/rtengine/stdimagesource.h index 7914772fb..22e810d09 100644 --- a/rtengine/stdimagesource.h +++ b/rtengine/stdimagesource.h @@ -34,8 +34,8 @@ class StdImageSource : public ImageSource { char** needhr; int max[3]; - void transform (PreviewProps pp, int tran, int &sx1, int &sy1, int &sx2, int &sy2) const; - void transformPixel (int x, int y, int tran, int& tx, int& ty) const; + void transform (PreviewProps pp, int tran, int &sx1, int &sy1, int &sx2, int &sy2); + void transformPixel (int x, int y, int tran, int& tx, int& ty); bool rgbSourceModified; public: StdImageSource (); @@ -67,7 +67,7 @@ class StdImageSource : public ImageSource { protected: void getImage_ (ColorTemp ctemp, int tran, Imagefloat* image, PreviewProps pp, bool first, HRecParams hrp); void hflip (Imagefloat* im); - void vflip (Imagefloat* im) const; + void vflip (Imagefloat* im); }; } #endif diff --git a/rtexif/nikonattribs.cc b/rtexif/nikonattribs.cc index e64b5e17f..bd1f0e176 100644 --- a/rtexif/nikonattribs.cc +++ b/rtexif/nikonattribs.cc @@ -131,37 +131,37 @@ class NAAFInfoInterpreter : public Interpreter { std::ostringstream af; if (aff&1) - if (af.str().empty()) af << "Center"; + if (af.str()=="") af << "Center"; else af << ", Center"; else if (aff&2) - if (af.str().empty()) af << "Top"; + if (af.str()=="") af << "Top"; else af << ", Top"; else if (aff&4) - if (af.str().empty()) af << "Bottom"; + if (af.str()=="") af << "Bottom"; else af << ", Bottom"; else if (aff&8) - if (af.str().empty()) af << "Left"; + if (af.str()=="") af << "Left"; else af << ", Left"; else if (aff&16) - if (af.str().empty()) af << "Right"; + if (af.str()=="") af << "Right"; else af << ", Right"; else if (aff&32) - if (af.str().empty()) af << "Upper-left"; + if (af.str()=="") af << "Upper-left"; else af << ", Upper-left"; else if (aff&64) - if (af.str().empty()) af << "Upper-right"; + if (af.str()=="") af << "Upper-right"; else af << ", Upper-right"; else if (aff&128) - if (af.str().empty()) af << " Lower-left"; + if (af.str()=="") af << " Lower-left"; else af << ", Lower-left"; else if (aff&256) - if (af.str().empty()) af << "Lower-right"; + if (af.str()=="") af << "Lower-right"; else af << ", Lower-right"; else if (aff&512) - if (af.str().empty()) af << "Far Left"; + if (af.str()=="") af << "Far Left"; else af << ", Far Left"; else if (aff&1024) { - if (af.str().empty()) af << "Far Right"; + if (af.str()=="") af << "Far Right"; else af << ", Far Right"; } @@ -688,7 +688,7 @@ class NALensDataInterpreter : public Interpreter { lid << std::setw(2) << std::setfill('0') << (int)buffer[lidoffs+i] << ' '; lid << std::setw(2) << std::setfill('0') << lenstype; - std::map::const_iterator r = lenses.find (lid.str()); + std::map::iterator r = lenses.find (lid.str()); if (r!=lenses.end()) ld << "Lens = " << r->second; else diff --git a/rtexif/olympusattribs.cc b/rtexif/olympusattribs.cc index 2a9ba9eb3..9cc6206d0 100644 --- a/rtexif/olympusattribs.cc +++ b/rtexif/olympusattribs.cc @@ -134,7 +134,7 @@ class OLLensTypeInterpreter : public Interpreter { lid << std::setw(2) << std::setfill('0') << t->toInt(2)<< ' '; //model lid << std::setw(2) << std::setfill('0') << t->toInt(3); // submodel - std::map::const_iterator r = lenses.find (lid.str()); + std::map::iterator r = lenses.find (lid.str()); if (r!=lenses.end()) return r->second; else diff --git a/rtexif/pentaxattribs.cc b/rtexif/pentaxattribs.cc index 9b024614f..1abb90c9a 100644 --- a/rtexif/pentaxattribs.cc +++ b/rtexif/pentaxattribs.cc @@ -382,7 +382,7 @@ public: } virtual std::string toString (Tag* t) { int c = 256*t->toInt(0,BYTE) + t->toInt(1,BYTE); - std::map::const_iterator r = choices.find (c); + std::map::iterator r = choices.find (c); if (r!=choices.end()){ std::ostringstream s; s << r->second; @@ -423,10 +423,10 @@ public: choices3[255] = "Video"; } virtual std::string toString (Tag* t) { - std::map::const_iterator r = choices.find (t->toInt(0,BYTE)); - std::map::const_iterator r1 = choices1.find (t->toInt(1,BYTE)); - std::map::const_iterator r2 = choices2.find (t->toInt(2,BYTE)); - std::map::const_iterator r3 = choices3.find (t->toInt(3,BYTE)); + std::map::iterator r = choices.find (t->toInt(0,BYTE)); + std::map::iterator r1 = choices1.find (t->toInt(1,BYTE)); + std::map::iterator r2 = choices2.find (t->toInt(2,BYTE)); + std::map::iterator r3 = choices3.find (t->toInt(3,BYTE)); std::ostringstream s; s << ((r !=choices.end())? r->second : ""); s << ((r1!=choices1.end())? r1->second : "")<<" "; @@ -888,7 +888,7 @@ public: choices[0xa] = "Trailing-curtain Sync"; } virtual std::string toString (Tag* t) { - std::map::const_iterator r = choices.find (t->toInt(0,BYTE) >>4); + std::map::iterator r = choices.find (t->toInt(0,BYTE) >>4); if (r!=choices.end()) return r->second; else { diff --git a/rtexif/rtexif.cc b/rtexif/rtexif.cc index 2b2712a1d..2de29d2b7 100644 --- a/rtexif/rtexif.cc +++ b/rtexif/rtexif.cc @@ -110,7 +110,7 @@ TagDirectory* TagDirectory::getRoot() else return this; } -const TagAttrib* TagDirectory::getAttrib (int id) const { +const TagAttrib* TagDirectory::getAttrib (int id) { if (attribs) for (int i=0; attribs[i].ignore!=-1; i++) @@ -1428,7 +1428,7 @@ int ExifManager::createJPEGMarker (const TagDirectory* root, const rtengine::pro else cl = new TagDirectory (NULL, ifdAttribs, INTEL); - for (rtengine::procparams::ExifPairs::const_iterator i=changeList.begin(); i!=changeList.end(); ++i) + for (rtengine::procparams::ExifPairs::const_iterator i=changeList.begin(); i!=changeList.end(); i++) cl->applyChange (i->first, i->second); getDefaultTIFFTags (cl); @@ -1437,7 +1437,7 @@ int ExifManager::createJPEGMarker (const TagDirectory* root, const rtengine::pro defTags[1]->setInt (H, 0, LONG); defTags[8]->setInt (8, 0, SHORT); - for (size_t i=defTags.size()-1; i>0; i--) + for (int i=defTags.size()-1; i>=0; i--) cl->replaceTag (defTags[i]->clone (cl)); cl->sort (); int size = cl->write (8, buffer+6); @@ -1493,7 +1493,7 @@ int ExifManager::createTIFFHeader (const TagDirectory* root, const rtengine::pro } // apply list of changes - for (rtengine::procparams::ExifPairs::const_iterator i=changeList.begin(); i!=changeList.end(); ++i) + for (rtengine::procparams::ExifPairs::const_iterator i=changeList.begin(); i!=changeList.end(); i++) cl->applyChange (i->first, i->second); // append default properties @@ -1504,7 +1504,7 @@ int ExifManager::createTIFFHeader (const TagDirectory* root, const rtengine::pro defTags[8]->initInt(0, SHORT, 3); for (int i=0;i<3;i++) defTags[8]->setInt(bps, i*2, SHORT); - for (size_t i=defTags.size()-1; i>0; i--) + for (int i=defTags.size()-1; i>=0; i--) cl->replaceTag (defTags[i]->clone (cl)); // calculate strip offsets diff --git a/rtexif/rtexif.h b/rtexif/rtexif.h index e7a9aedb2..020062c5d 100644 --- a/rtexif/rtexif.h +++ b/rtexif/rtexif.h @@ -77,9 +77,9 @@ class TagDirectory { TagDirectory* getParent () { return parent; } TagDirectory* getRoot (); inline int getCount () const { return tags.size (); } - const TagAttrib* getAttrib (int id) const; + const TagAttrib* getAttrib (int id); const TagAttrib* getAttrib (const char* name); - const TagAttrib* getAttribTable() const { return attribs; } + const TagAttrib* getAttribTable() { return attribs; } virtual Tag* getTag (const char* name) const; virtual Tag* getTag (int ID) const; virtual Tag* findTag (const char* name) const; @@ -181,14 +181,14 @@ class Tag { Tag* clone (TagDirectory* parent); // to control if the tag shall be written - bool getKeep () const { return keep; } + bool getKeep () { return keep; } void setKeep (bool k) { keep = k; } // get subdirectory (there can be several, the last is NULL) - bool isDirectory () const { return directory!=NULL; } + bool isDirectory () { return directory!=NULL; } TagDirectory* getDirectory (int i=0) { return directory[i]; } - MNKind getMakerNoteFormat () const { return makerNoteKind; } + MNKind getMakerNoteFormat () { return makerNoteKind; } }; class ExifManager { diff --git a/rtgui/batchqueue.cc b/rtgui/batchqueue.cc index d4e15fe88..f89c4a33b 100644 --- a/rtgui/batchqueue.cc +++ b/rtgui/batchqueue.cc @@ -90,7 +90,7 @@ void BatchQueue::addEntries ( std::vector &entries, bool head) Glib::RWLock::WriterLock l(entryRW); #endif - for( std::vector::iterator entry = entries.begin(); entry != entries.end(); ++entry){ + for( std::vector::iterator entry = entries.begin(); entry != entries.end();entry++ ){ (*entry)->setParent (this); (*entry)->resize (std::min(options.thumbSize, getMaxThumbnailHeight())); // batch queue might have smaller, restricted size Glib::ustring tempFile = getTempFilenameForParams( (*entry)->filename ); @@ -104,7 +104,7 @@ void BatchQueue::addEntries ( std::vector &entries, bool head) fd.push_back (*entry); else { std::vector::iterator pos; - for (pos=fd.begin(); pos!=fd.end(); ++pos) + for (pos=fd.begin(); pos!=fd.end(); pos++) if (!(*pos)->processing) { fd.insert (pos, *entry); break; @@ -136,7 +136,7 @@ bool BatchQueue::saveBatchQueue( ) return false; // method is already running with entryLock, so no need to lock again - for (std::vector::const_iterator pos=fd.begin(); pos!=fd.end(); ++pos){ + for (std::vector::iterator pos=fd.begin(); pos!=fd.end(); pos++){ BatchQueueEntry* bqe = reinterpret_cast(*pos); fprintf(f,"%s;%s\n", bqe->filename.c_str(),bqe->savedParamsFile.c_str() ); } @@ -244,7 +244,7 @@ void BatchQueue::cancelItems (std::vector* items) { #endif for (size_t i=0; isize(); i++) { - BatchQueueEntry* entry = static_cast((*items)[i]); + BatchQueueEntry* entry = (BatchQueueEntry*)(*items)[i]; if (entry->processing) continue; std::vector::iterator pos = std::find (fd.begin(), fd.end(), entry); @@ -274,15 +274,15 @@ void BatchQueue::headItems (std::vector* items) { #ifdef WIN32 Glib::RWLock::WriterLock l(entryRW); #endif - for (size_t i=items->size()-1; i>0; i--) { - BatchQueueEntry* entry = static_cast((*items)[i]); + for (int i=items->size()-1; i>=0; i--) { + BatchQueueEntry* entry = (BatchQueueEntry*)(*items)[i]; if (entry->processing) continue; std::vector::iterator pos = std::find (fd.begin(), fd.end(), entry); if (pos!=fd.end() && pos!=fd.begin()) { fd.erase (pos); // find the first item that is not under processing - for (pos=fd.begin(); pos!=fd.end(); ++pos) + for (pos=fd.begin(); pos!=fd.end(); pos++) if (!(*pos)->processing) { fd.insert (pos, entry); break; @@ -302,7 +302,7 @@ void BatchQueue::tailItems (std::vector* items) { Glib::RWLock::WriterLock l(entryRW); #endif for (size_t i=0; isize(); i++) { - BatchQueueEntry* entry = static_cast((*items)[i]); + BatchQueueEntry* entry = (BatchQueueEntry*)(*items)[i]; if (entry->processing) continue; std::vector::iterator pos = std::find (fd.begin(), fd.end(), entry); @@ -373,7 +373,7 @@ rtengine::ProcessingJob* BatchQueue::imageReady (rtengine::IImage16* img) { // save image img Glib::ustring fname; SaveFormat saveFormat; - if (processing->outFileName.empty()) { // auto file name + if (processing->outFileName=="") { // auto file name Glib::ustring s = calcAutoFileNameBase (processing->filename); saveFormat = options.saveFormatBatch; fname = autoCompleteFileName (s, saveFormat.format); @@ -384,7 +384,7 @@ rtengine::ProcessingJob* BatchQueue::imageReady (rtengine::IImage16* img) { } //printf ("fname=%s, %s\n", fname.c_str(), removeExtension(fname).c_str()); - if (img && !fname.empty()) { + if (img && fname!="") { int err = 0; if (saveFormat.format=="tif") err = img->saveAsTIFF (fname, saveFormat.tiffBits,saveFormat.tiffUncompressed); @@ -449,7 +449,7 @@ rtengine::ProcessingJob* BatchQueue::imageReady (rtengine::IImage16* img) { Glib::ustring batchdir = options.rtdir+"/batch/"; Glib::RefPtr dir = Gio::File::create_for_path (batchdir); safe_build_file_list (dir, names, batchdir); - for(std::vector::const_iterator iter=names.begin(); iter != names.end(); ++iter) + for(std::vector::iterator iter=names.begin(); iter != names.end();iter++ ) safe_g_remove( *iter ); } } @@ -487,9 +487,9 @@ Glib::ustring BatchQueue::calcAutoFileNameBase (const Glib::ustring& origFileNam for (size_t i=1; i(this->get_parent()); + Gtk::Notebook *nb =(Gtk::Notebook *)(this->get_parent()); if (options.mainNBVertical) { Gtk::VBox* vbb = Gtk::manage (new Gtk::VBox ()); diff --git a/rtgui/batchtoolpanelcoord.cc b/rtgui/batchtoolpanelcoord.cc index 7416de2ec..09ac98a47 100644 --- a/rtgui/batchtoolpanelcoord.cc +++ b/rtgui/batchtoolpanelcoord.cc @@ -74,7 +74,7 @@ void BatchToolPanelCoordinator::closeSession (bool save) { pparamsEdited.combine (newParams, pparams, selected.size()==1); // trim new adjuster's values to the adjuster's limits - for (size_t j=0; jtrimValues (&newParams); selected[i]->setProcParams (newParams, NULL, BATCHEDITOR, true); @@ -102,11 +102,11 @@ void BatchToolPanelCoordinator::initSession () { /* if (!selected.empty()) { pparams = selected[0]->getProcParams (); - for (size_t i=0; isetDefaults (&pparams, &pparamsEdited); toolPanels[i]->read (&pparams, &pparamsEdited); } - for (size_t i=0; iprocParamsChanged (&pparams, rtengine::EvPhotoLoaded, "batch processing", &pparamsEdited); } */ @@ -270,7 +270,7 @@ void BatchToolPanelCoordinator::panelChanged (rtengine::ProcEvent event, const G pparamsEdited.combine (newParams, pparams, selected.size()==1); // trim new adjuster's values to the adjuster's limits - for (size_t j=0; jtrimValues (&newParams); selected[i]->setProcParams (newParams, NULL, BATCHEDITOR, false); diff --git a/rtgui/bqentryupdater.cc b/rtgui/bqentryupdater.cc index 0bc1cc389..f5463bda3 100644 --- a/rtgui/bqentryupdater.cc +++ b/rtgui/bqentryupdater.cc @@ -33,7 +33,7 @@ void BatchQueueEntryUpdater::process (guint8* oimg, int ow, int oh, int newh, BQ qMutex->lock (); // look up if an older version is in the queue std::list::iterator i; - for (i=jqueue.begin(); i!=jqueue.end(); ++i) + for (i=jqueue.begin(); i!=jqueue.end(); i++) if (i->oimg==oimg && i->listener==listener) { i->ow = ow; i->oh = oh; @@ -99,7 +99,7 @@ void BatchQueueEntryUpdater::removeJobs (BQEntryUpdateListener* listener) { while (!ready) { ready = true; std::list::iterator i; - for (i=jqueue.begin(); i!=jqueue.end(); ++i) + for (i=jqueue.begin(); i!=jqueue.end(); i++) if (i->listener == listener) { jqueue.erase (i); ready = false; diff --git a/rtgui/cachemanager.cc b/rtgui/cachemanager.cc index 137677271..05cc52d11 100644 --- a/rtgui/cachemanager.cc +++ b/rtgui/cachemanager.cc @@ -73,7 +73,7 @@ Thumbnail* CacheManager::getEntry (const Glib::ustring& fname) { { Glib::Mutex::Lock lock(mutex_); - string_thumb_map::const_iterator r = openEntries.find (fname); + string_thumb_map::iterator r = openEntries.find (fname); // if it is open, return it if (r!=openEntries.end()) { r->second->increaseRef (); @@ -83,7 +83,7 @@ Thumbnail* CacheManager::getEntry (const Glib::ustring& fname) { // compute the md5 std::string md5 = getMD5 (fname); - if (md5.empty()) + if (md5=="") return NULL; // build path name @@ -93,7 +93,7 @@ Thumbnail* CacheManager::getEntry (const Glib::ustring& fname) { if (safe_file_test (cfname, Glib::FILE_TEST_EXISTS)) { CacheImageData* cfs = new CacheImageData (); int e = cfs->load (cfname); - if (!e && cfs->supported) + if (!e && cfs->supported==true) res = new Thumbnail (this, fname, cfs); if (res && !res->isSupported ()) { delete res; @@ -117,7 +117,7 @@ Thumbnail* CacheManager::getEntry (const Glib::ustring& fname) { { Glib::Mutex::Lock lock(mutex_); - string_thumb_map::const_iterator r = openEntries.find (fname); + string_thumb_map::iterator r = openEntries.find (fname); if (r!=openEntries.end()) { delete res; r->second->increaseRef (); @@ -137,7 +137,7 @@ void CacheManager::deleteEntry (const Glib::ustring& fname) { Glib::Mutex::Lock lock(mutex_); // check if it is opened - string_thumb_map::const_iterator r = openEntries.find (fname); + string_thumb_map::iterator r = openEntries.find (fname); // if it is open, dont delete it if (r!=openEntries.end()) { std::string md5 = r->second->getMD5 (); @@ -152,7 +152,7 @@ void CacheManager::deleteEntry (const Glib::ustring& fname) { // if in the editor, the thumbnail still exists. If not, delete it: r = openEntries.find (fname); - if (r==openEntries.end() && !md5.empty()) { + if (r==openEntries.end() && md5!="") { safe_g_remove (getCacheFileName ("data", fname, md5) + ".txt"); safe_g_remove (getCacheFileName ("profiles", fname, md5) + paramFileExtension); safe_g_remove (getCacheFileName ("images", fname, md5) + ".cust16"); @@ -164,7 +164,7 @@ void CacheManager::deleteEntry (const Glib::ustring& fname) { } else { std::string md5 = getMD5 (fname); - if (!md5.empty()) { + if (md5!="") { safe_g_remove (getCacheFileName ("data", fname, md5) + ".txt"); safe_g_remove (getCacheFileName ("profiles", fname, md5) + paramFileExtension); safe_g_remove (getCacheFileName ("images", fname, md5) + ".cust16"); @@ -178,7 +178,7 @@ void CacheManager::deleteEntry (const Glib::ustring& fname) { void CacheManager::clearFromCache (const Glib::ustring& fname, bool leavenotrace) { std::string md5 = getMD5 (fname); - if (!md5.empty()) { + if (md5!="") { if (leavenotrace){ safe_g_remove (getCacheFileName ("data", fname, md5) + ".txt"); safe_g_remove (getCacheFileName ("profiles", fname, md5) + paramFileExtension); @@ -247,8 +247,8 @@ void CacheManager::clearAll () { deleteDir ("data"); // re-generate thumbnail images and clear profiles of open thumbnails - //string_thumb_map::const_iterator i; - //for (i=openEntries.begin(); i!=openEntries.end(); ++i) { + //string_thumb_map::iterator i; + //for (i=openEntries.begin(); i!=openEntries.end(); i++) { // i->second->clearProcParams (CACHEMGR); // i->second->generateThumbnailImage (); // i->second->updateCache (); diff --git a/rtgui/clipboard.h b/rtgui/clipboard.h index baac22a39..cce305e3d 100644 --- a/rtgui/clipboard.h +++ b/rtgui/clipboard.h @@ -36,19 +36,19 @@ class Clipboard { public: void setIPTC (const rtengine::procparams::IPTCPairs& iptcc) { iptc = iptcc; _hasIPTC = true;} - const rtengine::procparams::IPTCPairs& getIPTC () const { return iptc; } - bool hasIPTC () const { return _hasIPTC; } + const rtengine::procparams::IPTCPairs& getIPTC () { return iptc; } + bool hasIPTC () { return _hasIPTC; } void setPartialProfile (const rtengine::procparams::PartialProfile& pprofile); - const rtengine::procparams::PartialProfile& getPartialProfile () const { return partProfile; }; + const rtengine::procparams::PartialProfile& getPartialProfile () { return partProfile; }; void setProcParams (const rtengine::procparams::ProcParams& pparams); - const rtengine::procparams::ProcParams& getProcParams () const { return *partProfile.pparams; } - bool hasProcParams () const { return partProfile.pparams; } - bool hasPEdited () const { return partProfile.pedited; } + const rtengine::procparams::ProcParams& getProcParams () { return *partProfile.pparams; } + bool hasProcParams () { return partProfile.pparams; } + bool hasPEdited () { return partProfile.pedited; } void setCurveData (std::vector& p, DiagonalCurveType type ) { curve = p; hasCurveDataType = type; return; } - const std::vector & getCurveData () const { return curve; } - DiagonalCurveType hasCurveData () const { return hasCurveDataType; } + const std::vector & getCurveData () { return curve; } + DiagonalCurveType hasCurveData () { return hasCurveDataType; } Clipboard (); ~Clipboard (); diff --git a/rtgui/crop.cc b/rtgui/crop.cc index 4389e5a6b..a39081809 100644 --- a/rtgui/crop.cc +++ b/rtgui/crop.cc @@ -604,15 +604,15 @@ void Crop::refreshSize () { std::ostringstream ostrin; ostrin.precision (3); - // ostrin << h->get_value()/ppi->get_value() << " in x " << w->get_value()/ppi->get_value() << " in"; - ostrin << nh/ppi->get_value() << " in x " << nw/ppi->get_value() << " in"; + // ostrin << h->get_value()/ppi->get_value() << " in x " << w->get_value()/ppi->get_value() << " in";; + ostrin << nh/ppi->get_value() << " in x " << nw/ppi->get_value() << " in";; sizein->set_text (ostrin.str ()); std::ostringstream ostrcm; ostrcm.precision (3); - // ostrcm << h->get_value()/ppi->get_value()*2.54 << " cm x " << w->get_value()/ppi->get_value()*2.54 << " cm"; - ostrcm << nh/ppi->get_value()*2.54 << " cm x " << nw/ppi->get_value()*2.54 << " cm"; + // ostrcm << h->get_value()/ppi->get_value()*2.54 << " cm x " << w->get_value()/ppi->get_value()*2.54 << " cm";; + ostrcm << nh/ppi->get_value()*2.54 << " cm x " << nw/ppi->get_value()*2.54 << " cm";; sizecm->set_text (ostrcm.str ()); } @@ -642,7 +642,7 @@ void Crop::setDimensions (int mw, int mh) { if (!wconnWasBlocked) wconn.block (false); if (!hconnWasBlocked) hconn.block (false); - if (!enabled->get_active()) { + if (enabled->get_active()==false) { nx = 0; ny = 0; nw = mw; @@ -962,7 +962,7 @@ void Crop::cropManipReady () { double Crop::getRatio () { double r = -1.0; - if (!fixr->get_active()) + if (fixr->get_active()==false) return r; r = cropratio[ratio->get_active_row_number()].value; diff --git a/rtgui/crophandler.cc b/rtgui/crophandler.cc index f5555f75f..6abb7e1ba 100644 --- a/rtgui/crophandler.cc +++ b/rtgui/crophandler.cc @@ -141,7 +141,7 @@ void CropHandler::setWSize (int w, int h) { update (); } -void CropHandler::getWSize (int& w, int &h) const { +void CropHandler::getWSize (int& w, int &h) { w = ww; h = wh; @@ -157,7 +157,7 @@ void CropHandler::setPosition (int x, int y, bool update_) { update (); } -void CropHandler::getPosition (int& x, int& y) const { +void CropHandler::getPosition (int& x, int& y) { x = cropX; y = cropY; @@ -322,12 +322,12 @@ void CropHandler::setEnabled (bool e) { update (); } -bool CropHandler::getEnabled () const { +bool CropHandler::getEnabled () { return enabled; } -void CropHandler::getSize (int& w, int& h) const { +void CropHandler::getSize (int& w, int& h) { w = cropW; h = cropH; diff --git a/rtgui/crophandler.h b/rtgui/crophandler.h index 3d3565feb..af9565dd0 100644 --- a/rtgui/crophandler.h +++ b/rtgui/crophandler.h @@ -82,13 +82,13 @@ class CropHandler : public rtengine::DetailedCropListener, public rtengine::Size void setZoom (int z, int centerx=-1, int centery=-1); double getFitZoom (); void setWSize (int w, int h); - void getWSize (int& w, int &h) const; + void getWSize (int& w, int &h); void setPosition (int x, int y, bool update=true); - void getPosition (int& x, int& y) const; - void getSize (int& w, int& h) const; + void getPosition (int& x, int& y); + void getSize (int& w, int& h); void setEnabled (bool e); - bool getEnabled () const; + bool getEnabled (); // DetailedCropListener interface void setDetailedCrop (rtengine::IImage8* im, rtengine::IImage8* imworking,rtengine::procparams::ColorManagementParams cmp, diff --git a/rtgui/cropwindow.cc b/rtgui/cropwindow.cc index de7cabf79..f59c804a3 100644 --- a/rtgui/cropwindow.cc +++ b/rtgui/cropwindow.cc @@ -119,13 +119,13 @@ void CropWindow::setPosition (int x, int y) { buttonSet.arrangeButtons (xpos + sideBorderWidth, ypos + upperBorderWidth, width - 2*sideBorderWidth, titleHeight); } -void CropWindow::getPosition (int& x, int& y) const { +void CropWindow::getPosition (int& x, int& y) { x = xpos; y = ypos; } -void CropWindow::getCropPosition (int& x, int& y) const { +void CropWindow::getCropPosition (int& x, int& y) { int cropX, cropY; cropHandler.getPosition (cropX, cropY); @@ -166,7 +166,7 @@ void CropWindow::getCropRectangle (int& x, int& y, int& w, int& h) { void CropWindow::setCropPosition (int x, int y) { cropHandler.setPosition (x, y); - for (std::list::const_iterator i=listeners.begin(); i!=listeners.end(); ++i) + for (std::list::iterator i=listeners.begin(); i!=listeners.end(); i++) (*i)->cropPositionChanged (this); } @@ -202,19 +202,19 @@ void CropWindow::setSize (int w, int h, bool norefresh) { //iarea->redraw (); } -void CropWindow::getSize (int& w, int& h) const { +void CropWindow::getSize (int& w, int& h) { w = width; h = height; } -void CropWindow::getCropSize (int& w, int& h) const { +void CropWindow::getCropSize (int& w, int& h) { w = imgAreaW; h = imgAreaH; } -bool CropWindow::isInside (int x, int y) const { +bool CropWindow::isInside (int x, int y) { return x>=xpos && x=ypos && y::const_iterator i=listeners.begin(); i!=listeners.end(); ++i) + for (std::list::iterator i=listeners.begin(); i!=listeners.end(); i++) (*i)->cropWindowSizeChanged (this); } else if (state==SCropImgMove) { @@ -344,7 +344,7 @@ void CropWindow::buttonRelease (int button, int num, int bstate, int x, int y) { cropHandler.setPosition (cropX + action_x, cropY + action_y); cropHandler.getPosition (cropX, cropY); state = SNormal; - for (std::list::const_iterator i=listeners.begin(); i!=listeners.end(); ++i) + for (std::list::iterator i=listeners.begin(); i!=listeners.end(); i++) (*i)->cropPositionChanged (this); } else if (state==SRotateSelecting) { @@ -379,7 +379,7 @@ void CropWindow::pointerMoved (int x, int y) { } else if (state==SCropWinResize) { setSize (press_x + x - action_x, press_y + y - action_y, true); - for (std::list::const_iterator i=listeners.begin(); i!=listeners.end(); ++i) + for (std::list::iterator i=listeners.begin(); i!=listeners.end(); i++) (*i)->cropWindowSizeChanged (this); iarea->redraw (); } @@ -391,7 +391,7 @@ void CropWindow::pointerMoved (int x, int y) { factor = 1.0; action_x = (press_x - x) / zoomSteps[cropZoom].zoom * factor; action_y = (press_y - y) / zoomSteps[cropZoom].zoom * factor; - for (std::list::const_iterator i=listeners.begin(); i!=listeners.end(); ++i) + for (std::list::iterator i=listeners.begin(); i!=listeners.end(); i++) (*i)->cropPositionChanged (this); iarea->redraw (); } @@ -743,7 +743,7 @@ void CropWindow::expose (Cairo::RefPtr cr) { //TODO: dynamically determine appropriate values based on image analysis - blur_radius=4; + blur_radius=4;; focus_thresh=80; blur_radius2 = blur_radius/4; // Band2 @@ -989,16 +989,16 @@ void CropWindow::zoom11 () { fitZoom = false; } -double CropWindow::getZoom () const { +double CropWindow::getZoom () { return zoomSteps[cropZoom].zoom; } -bool CropWindow::isMinZoom () const { +bool CropWindow::isMinZoom () { return cropZoom <= 0; } -bool CropWindow::isMaxZoom () const { +bool CropWindow::isMaxZoom () { return cropZoom >= MAXZOOMSTEPS; } @@ -1067,12 +1067,12 @@ void CropWindow::changeZoom (int zoom, bool notify, int centerx, int centery) { cropLabel = zoomSteps[cropZoom].label; cropHandler.setZoom (zoomSteps[cropZoom].czoom, centerx, centery); if (notify) - for (std::list::const_iterator i=listeners.begin(); i!=listeners.end(); ++i) + for (std::list::iterator i=listeners.begin(); i!=listeners.end(); i++) (*i)->cropZoomChanged (this); iarea->redraw (); } -void CropWindow::translateCoord (int phyx, int phyy, int& imgx, int& imgy) const { +void CropWindow::translateCoord (int phyx, int phyy, int& imgx, int& imgy) { int cropX, cropY; cropHandler.getPosition (cropX, cropY); @@ -1283,7 +1283,7 @@ void CropWindow::cropWindowChanged () { void CropWindow::initialImageArrived () { - for (std::list::const_iterator i=listeners.begin(); i!=listeners.end(); ++i) + for (std::list::iterator i=listeners.begin(); i!=listeners.end(); i++) (*i)->initialImageArrived (this); } @@ -1293,7 +1293,7 @@ void CropWindow::remoteMove (int deltaX, int deltaY) { state = SCropImgMove; action_x = deltaX; action_y = deltaY; - for (std::list::const_iterator i=listeners.begin(); i!=listeners.end(); ++i) + for (std::list::iterator i=listeners.begin(); i!=listeners.end(); i++) (*i)->cropPositionChanged (this); } @@ -1304,7 +1304,7 @@ void CropWindow::remoteMoveReady () { cropHandler.setPosition (cropX + action_x, cropY + action_y); cropHandler.getPosition (cropX, cropY); state = SNormal; - for (std::list::const_iterator i=listeners.begin(); i!=listeners.end(); ++i) + for (std::list::iterator i=listeners.begin(); i!=listeners.end(); i++) (*i)->cropPositionChanged (this); } @@ -1315,5 +1315,5 @@ void CropWindow::delCropWindowListener (CropWindowListener* l) { if (*i==l) i = listeners.erase (i); else - ++i; + i++; } diff --git a/rtgui/cropwindow.h b/rtgui/cropwindow.h index 3992c83dd..b049f3fd5 100644 --- a/rtgui/cropwindow.h +++ b/rtgui/cropwindow.h @@ -89,7 +89,7 @@ class CropWindow : public LWButtonListener, public CropHandlerListener { void drawStraightenGuide (Cairo::RefPtr cr); void drawSpotWBRectangle (Cairo::RefPtr cr); void drawObservedFrame (Cairo::RefPtr cr, int rw=0, int rh=0); - void translateCoord (int phyx, int phyy, int& imgx, int& imgy) const; + void translateCoord (int phyx, int phyy, int& imgx, int& imgy); void changeZoom (int zoom, bool notify=true, int centerx=-1, int centery=-1); void getObservedFrameArea(int& x, int& y, int& w, int& h, int rw=0, int rh=0); @@ -103,22 +103,22 @@ class CropWindow : public LWButtonListener, public CropHandlerListener { void setObservedCropWin (CropWindow* cw) { observedCropWin = cw; } void setPosition (int x, int y); - void getPosition (int& x, int& y) const; + void getPosition (int& x, int& y); void setSize (int w, int h, bool norefresh=false); - void getSize (int& w, int& h) const; + void getSize (int& w, int& h); // zoomlistener interface void zoomIn (bool toCursor=false, int cursorX=-1, int cursorY=-1); void zoomOut (bool toCursor=false, int cursorX=-1, int cursorY=-1); void zoom11 (); void zoomFit (); - double getZoom () const; - bool isMinZoom () const; - bool isMaxZoom () const; + double getZoom (); + bool isMinZoom (); + bool isMaxZoom (); void setZoom (double zoom); void findCenter (int deltaZoom, int& x, int& y); - bool isInside (int x, int y) const; + bool isInside (int x, int y); void buttonPress (int button, int num, int state, int x, int y); @@ -133,9 +133,9 @@ class CropWindow : public LWButtonListener, public CropHandlerListener { // crop handling void getCropRectangle (int& x, int& y, int& w, int& h); - void getCropPosition (int& x, int& y) const; + void getCropPosition (int& x, int& y); void setCropPosition (int x, int y); - void getCropSize (int& w, int& h) const; + void getCropSize (int& w, int& h); // listeners void setCropGUIListener (CropGUIListener* cgl) { cropgl = cgl; } diff --git a/rtgui/curveeditorgroup.cc b/rtgui/curveeditorgroup.cc index b941dcb07..d321f1130 100644 --- a/rtgui/curveeditorgroup.cc +++ b/rtgui/curveeditorgroup.cc @@ -41,7 +41,7 @@ CurveEditorGroup::CurveEditorGroup (Glib::ustring groupLabel) : cl(NULL), cp(NUL } CurveEditorGroup::~CurveEditorGroup() { - for (std::vector::const_iterator i = curveEditors.begin(); i != curveEditors.end(); ++i) + for (std::vector::iterator i = curveEditors.begin(); i != curveEditors.end(); ++i) { delete *i; } @@ -100,8 +100,8 @@ void CurveEditorGroup::newLine() { headerBox->pack_end (*curve_reset, Gtk::PACK_SHRINK, 0); } - size_t j = numberOfPackedCurve; - for (size_t i = curveEditors.size()-1; i > j; i--) + int j = numberOfPackedCurve; + for (int i = (int)(curveEditors.size())-1; i >= j; i--) { headerBox->pack_end (*curveEditors[i]->curveType->buttonGroup, Gtk::PACK_EXPAND_WIDGET, 2); numberOfPackedCurve++; @@ -268,7 +268,7 @@ void CurveEditorGroup::curveResetPressed () { } void CurveEditorGroup::setBatchMode (bool batchMode) { - for (std::vector::const_iterator i = curveEditors.begin(); i != curveEditors.end(); ++i) { + for (std::vector::iterator i = curveEditors.begin(); i != curveEditors.end(); ++i) { (*i)->curveType->addEntry("curveType-unchanged.png", M("GENERAL_UNCHANGED")); (*i)->curveType->show(); } diff --git a/rtgui/curveeditorgroup.h b/rtgui/curveeditorgroup.h index 4ca12ab04..b2f24cf5a 100644 --- a/rtgui/curveeditorgroup.h +++ b/rtgui/curveeditorgroup.h @@ -57,7 +57,7 @@ protected: CurveListener* cl; ColorProvider* cp; - size_t numberOfPackedCurve; + unsigned int numberOfPackedCurve; public: CurveEditorGroup(Glib::ustring groupLabel = ""); @@ -94,8 +94,8 @@ protected: CurveEditorGroup *parent; public: - int getValUnchanged() const { return valUnchanged; } - int getValLinear() const { return valLinear; } + int getValUnchanged() { return valUnchanged; } + int getValLinear() { return valLinear; } virtual void updateBackgroundHistogram (CurveEditor* ce) {} virtual void setColorProvider (ColorProvider* p) = 0; diff --git a/rtgui/curvelistener.h b/rtgui/curvelistener.h index 062d2a3bc..72980c5d2 100644 --- a/rtgui/curvelistener.h +++ b/rtgui/curvelistener.h @@ -29,7 +29,7 @@ class CurveListener { virtual void curveChanged () {} virtual void curveChanged (CurveEditor* ce) {} void setMulti(bool value) { multi = value; } - bool isMulti() const { return multi; } + bool isMulti() { return multi; } CurveListener() : multi(false) {} }; diff --git a/rtgui/diagonalcurveeditorsubgroup.cc b/rtgui/diagonalcurveeditorsubgroup.cc index 258934773..e4795e13b 100644 --- a/rtgui/diagonalcurveeditorsubgroup.cc +++ b/rtgui/diagonalcurveeditorsubgroup.cc @@ -301,7 +301,7 @@ void DiagonalCurveEditorSubGroup::switchGUI() { void DiagonalCurveEditorSubGroup::savePressed () { Glib::ustring fname = outputFile(); - if (!fname.empty()) { + if (fname.size()) { std::ofstream f (fname.c_str()); std::vector p; //std::vector p = customCurve->getPoints (); @@ -331,12 +331,12 @@ void DiagonalCurveEditorSubGroup::savePressed () { f << "Parametric\n"; if (p[ix]==(double)(DCT_Parametric)) { ix++; - for (size_t i=0; i p; @@ -503,7 +503,7 @@ void DiagonalCurveEditorSubGroup::restoreDisplayedHistogram() { void DiagonalCurveEditorSubGroup::storeCurveValues (CurveEditor* ce, const std::vector& p) { if (!p.empty()) { DiagonalCurveType t = (DiagonalCurveType)p[0]; - for (size_t i=0; iappend(); + Gtk::TreeModel::iterator root = dirTreeModel->append(); root->set_value (dtColumns.filename, Glib::ustring(volume)); root->set_value (dtColumns.dirname, Glib::ustring(volume)); @@ -121,13 +121,13 @@ void DirBrowser::addRoot (char letter) { root->set_value (1, ihdd); } - Gtk::TreeModel::const_iterator child = dirTreeModel->append (root->children()); + Gtk::TreeModel::iterator child = dirTreeModel->append (root->children()); child->set_value (dtColumns.filename, Glib::ustring("foo")); } void DirBrowser::updateDirTreeRoot () { - for (Gtk::TreeModel::iterator i=dirTreeModel->children().begin(); i!=dirTreeModel->children().end(); ++i) + for (Gtk::TreeModel::iterator i=dirTreeModel->children().begin(); i!=dirTreeModel->children().end(); i++) updateDirTree (i); } @@ -135,7 +135,7 @@ void DirBrowser::updateDirTree (const Gtk::TreeModel::iterator& iter) { if (dirtree->row_expanded (dirTreeModel->get_path (iter))) { updateDir (iter); - for (Gtk::TreeModel::iterator i=iter->children().begin(); i!=iter->children().end(); ++i) + for (Gtk::TreeModel::iterator i=iter->children().begin(); i!=iter->children().end(); i++) updateDirTree (i); } } @@ -148,7 +148,7 @@ void DirBrowser::updateVolumes () { for (int i=0; i<32; i++) if (((volumes >> i) & 1) && !((nvolumes >> i) & 1)) { // volume i has been deleted - for (Gtk::TreeModel::iterator iter = dirTreeModel->children().begin(); iter!=dirTreeModel->children().end(); ++iter) + for (Gtk::TreeModel::iterator iter = dirTreeModel->children().begin(); iter!=dirTreeModel->children().end(); iter++) if (iter->get_value (dtColumns.filename).c_str()[0]-'A' == i) { dirTreeModel->erase (iter); break; @@ -234,7 +234,7 @@ void DirBrowser::updateDir (const Gtk::TreeModel::iterator& iter) { bool change = true; while (change) { change = false; - for (Gtk::TreeModel::const_iterator it=iter->children().begin(); it!=iter->children().end(); ++it) + for (Gtk::TreeModel::iterator it=iter->children().begin(); it!=iter->children().end(); it++) if (!safe_file_test (it->get_value (dtColumns.dirname), Glib::FILE_TEST_EXISTS) || !safe_file_test (it->get_value (dtColumns.dirname), Glib::FILE_TEST_IS_DIR)) { dirTreeModel->erase (it); @@ -247,9 +247,9 @@ void DirBrowser::updateDir (const Gtk::TreeModel::iterator& iter) { Glib::RefPtr dir = Gio::File::create_for_path (iter->get_value (dtColumns.dirname)); safe_build_subdir_list (dir, subDirs, options.fbShowHidden); - for (size_t i=0; ichildren().begin(); it!=iter->children().end() && !found ; ++it) + for (Gtk::TreeModel::iterator it=iter->children().begin(); it!=iter->children().end() && !found ; it++) found = (it->get_value (dtColumns.filename)==subDirs[i]); if (!found) @@ -259,13 +259,13 @@ void DirBrowser::updateDir (const Gtk::TreeModel::iterator& iter) { void DirBrowser::addDir (const Gtk::TreeModel::iterator& iter, const Glib::ustring& dirname) { - Gtk::TreeModel::const_iterator child = dirTreeModel->append(iter->children()); + Gtk::TreeModel::iterator child = dirTreeModel->append(iter->children()); child->set_value (dtColumns.filename, dirname); child->set_value (0, openfolder); child->set_value (1, closedfolder); Glib::ustring fullname = Glib::build_filename (iter->get_value (dtColumns.dirname), dirname); child->set_value (dtColumns.dirname, fullname); - Gtk::TreeModel::const_iterator fooRow = dirTreeModel->append(child->children()); + Gtk::TreeModel::iterator fooRow = dirTreeModel->append(child->children()); fooRow->set_value (dtColumns.filename, Glib::ustring("foo")); } @@ -288,7 +288,7 @@ Gtk::TreePath DirBrowser::expandToDir (const Glib::ustring& absDirPath) { expandSuccess = true; #ifndef WIN32 - Gtk::TreeModel::const_iterator j = dirTreeModel->get_iter (path); + Gtk::TreeModel::iterator j = dirTreeModel->get_iter (path); path.up (); path.append_index (0); row_expanded(j, path); @@ -301,7 +301,7 @@ Gtk::TreePath DirBrowser::expandToDir (const Glib::ustring& absDirPath) { if (count==0) dirstr = dirstr + "\\"; #endif - Gtk::TreeModel::const_iterator i = dirTreeModel->get_iter (path); + Gtk::TreeModel::iterator i = dirTreeModel->get_iter (path); int ix = 0; while (i && expandSuccess) { Gtk::TreeModel::Row crow = *i; @@ -318,7 +318,7 @@ Gtk::TreePath DirBrowser::expandToDir (const Glib::ustring& absDirPath) { break; } ix++; - ++i; + i++; } count++; dir = strtok(NULL, "/\\"); diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc index 45924ba48..7c07f8d9c 100644 --- a/rtgui/editorpanel.cc +++ b/rtgui/editorpanel.cc @@ -685,7 +685,7 @@ void EditorPanel::info_toggled () { idata->getFocalLen()); expcomp = Glib::ustring(idata->expcompToString(idata->getExpComp(),true)); // maskZeroexpcomp - if (!expcomp.empty()){ + if (expcomp!=""){ infoString2 = Glib::ustring::compose("%1 %2EV", infoString2, expcomp /*Glib::ustring(idata->expcompToString(idata->getExpComp()))*/); @@ -1339,7 +1339,7 @@ void EditorPanel::histogramChanged (LUTu & histRed, LUTu & histGreen, LUTu & his } bool EditorPanel::CheckSidePanelsVisibility() { - if(!tbTopPanel_1->get_active() && !tbRightPanel_1->get_active() && !hidehp->get_active()) + if(tbTopPanel_1->get_active()==false && tbRightPanel_1->get_active()==false && hidehp->get_active()==false) return false; else return true; @@ -1354,7 +1354,7 @@ void EditorPanel::toggleSidePanels(){ tbTopPanel_1->set_active (!bAllSidePanelsVisible); tbRightPanel_1->set_active (!bAllSidePanelsVisible); hidehp->set_active (!bAllSidePanelsVisible); - if (!bAllSidePanelsVisible) + if (bAllSidePanelsVisible == false) tbShowHideSidePanels->set_image (*iShowHideSidePanels); else tbShowHideSidePanels->set_image (*iShowHideSidePanels_exit); diff --git a/rtgui/editwindow.cc b/rtgui/editwindow.cc index 79caeb647..57b3fe695 100644 --- a/rtgui/editwindow.cc +++ b/rtgui/editwindow.cc @@ -161,7 +161,7 @@ void EditWindow::remEditorPanel (EditorPanel* ep) { } bool EditWindow::selectEditorPanel(const std::string &name) { - std::map::const_iterator iep = epanels.find(name); + std::map::iterator iep = epanels.find(name); if (iep!=epanels.end()) { mainNB->set_current_page (mainNB->page_num (*iep->second)); @@ -189,14 +189,14 @@ bool EditWindow::on_delete_event(GdkEventAny* event) { // Check if any editor is still processing, and do NOT quit if so. Otherwise crashes and inconsistent caches bool isProcessing=false; - for ( std::set ::const_iterator iter = filesEdited.begin(); iter != filesEdited.end() && !isProcessing; ++iter ) { + for ( std::set ::iterator iter = filesEdited.begin(); iter != filesEdited.end() && !isProcessing; iter++ ) { if (epanels[*iter]->getIsProcessing()) isProcessing=true; } if (isProcessing) return false; - for ( std::set ::const_iterator iter = filesEdited.begin(); iter != filesEdited.end(); ++iter ) + for ( std::set ::iterator iter = filesEdited.begin(); iter != filesEdited.end(); iter++ ) mainNB->remove_page (*epanels[*iter]); epanels.clear(); diff --git a/rtgui/exifpanel.cc b/rtgui/exifpanel.cc index 5aeb1481c..fce35b62b 100644 --- a/rtgui/exifpanel.cc +++ b/rtgui/exifpanel.cc @@ -221,7 +221,7 @@ void ExifPanel::exifSelectionChanged () { reset->set_sensitive (1); } else if (sel.size()==1) { - Gtk::TreeModel::const_iterator iter = exifTreeModel->get_iter (sel[0]); + Gtk::TreeModel::iterator iter = exifTreeModel->get_iter (sel[0]); if (iter->get_value (exifColumns.action)==SYSTEM) { remove->set_sensitive (0); keep->set_sensitive (0); @@ -258,7 +258,7 @@ void ExifPanel::delIt (Gtk::TreeModel::iterator iter) { if (iter->get_value (exifColumns.action) != SYSTEM) iter->set_value (exifColumns.icon, delicon); if (recursiveOp) - for (Gtk::TreeModel::iterator i=iter->children().begin(); i!=iter->children().end(); ++i) + for (Gtk::TreeModel::iterator i=iter->children().begin(); i!=iter->children().end(); i++) delIt (i); } @@ -281,7 +281,7 @@ void ExifPanel::keepIt (Gtk::TreeModel::iterator iter) { if (iter->get_value (exifColumns.action) != SYSTEM) iter->set_value (exifColumns.icon, iter->get_value (exifColumns.edited) ? editicon : keepicon); if (recursiveOp) - for (Gtk::TreeModel::iterator i=iter->children().begin(); i!=iter->children().end(); ++i) + for (Gtk::TreeModel::iterator i=iter->children().begin(); i!=iter->children().end(); i++) keepIt (i); } @@ -360,7 +360,7 @@ void ExifPanel::resetAllPressed () { void ExifPanel::addPressed () { - Gtk::Dialog* dialog = new Gtk::Dialog (M("EXIFPANEL_ADDTAGDLG_TITLE"), *(static_cast(get_toplevel())), true, true); + Gtk::Dialog* dialog = new Gtk::Dialog (M("EXIFPANEL_ADDTAGDLG_TITLE"), *((Gtk::Window*)get_toplevel()), true, true); dialog->add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK); dialog->add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); @@ -384,7 +384,7 @@ void ExifPanel::addPressed () { hb2->pack_start (*ventry); Glib::ustring sel = getSelection (true); - if (sel.empty()) + if (sel=="") tcombo->set_active_text ("Exif.UserComment"); else { tcombo->set_active_text (sel); @@ -426,8 +426,8 @@ void ExifPanel::editTag (Gtk::TreeModel::Children root, Glib::ustring name, Glib Glib::ustring::size_type dp = name.find_first_of ('.'); Glib::ustring fseg = name.substr (0,dp); // look up first segment of the path - Gtk::TreeModel::const_iterator iter; - for (iter = root.begin(); iter!=root.end(); ++iter) + Gtk::TreeModel::iterator iter; + for (iter = root.begin(); iter!=root.end(); iter++) if (iter->get_value (exifColumns.field_nopango) == fseg) break; @@ -475,7 +475,7 @@ Glib::ustring ExifPanel::getSelectedValue () { std::vector rows = selection->get_selected_rows(); if (rows.size()!=1) return ""; - Gtk::TreeModel::const_iterator iter = exifTreeModel->get_iter (rows[0]); + Gtk::TreeModel::iterator iter = exifTreeModel->get_iter (rows[0]); if (iter) return iter->get_value (exifColumns.value_nopango); return ""; @@ -488,7 +488,7 @@ Glib::ustring ExifPanel::getSelection (bool onlyeditable) { if (rows.size()!=1) return ""; - Gtk::TreeModel::const_iterator iter = exifTreeModel->get_iter (rows[0]); + Gtk::TreeModel::iterator iter = exifTreeModel->get_iter (rows[0]); Glib::ustring ret = ""; bool first = true; @@ -509,11 +509,11 @@ Glib::ustring ExifPanel::getSelection (bool onlyeditable) { void ExifPanel::updateChangeList (Gtk::TreeModel::Children root, std::string prefix) { - if (!prefix.empty()) + if (prefix!="") prefix = prefix + "."; - Gtk::TreeModel::const_iterator iter; - for (iter = root.begin(); iter!=root.end(); ++iter) { + Gtk::TreeModel::iterator iter; + for (iter = root.begin(); iter!=root.end(); iter++) { if (iter->get_value (exifColumns.edited) == true) changeList[ prefix+iter->get_value (exifColumns.field_nopango) ] = iter->get_value (exifColumns.value_nopango); else if (iter->get_value (exifColumns.action) == WRITE && iter->get_value (exifColumns.icon) == delicon) @@ -539,7 +539,7 @@ void ExifPanel::applyChangeList () { void ExifPanel::row_activated (const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column) { - Gtk::TreeModel::const_iterator iter = exifTreeModel->get_iter (path); + Gtk::TreeModel::iterator iter = exifTreeModel->get_iter (path); if (iter) { if (!iter->children().empty()) if (exifTree->row_expanded (path)) diff --git a/rtgui/extprog.cc b/rtgui/extprog.cc index 7e4d00348..96469f9c6 100644 --- a/rtgui/extprog.cc +++ b/rtgui/extprog.cc @@ -45,7 +45,7 @@ bool ExtProgAction::Execute(std::vector fileNames) { if (fileNames.empty()) return false; // Check if they all exists (maybe not precessed yet) - for (size_t i=0;i fileNames) { } Glib::ustring cmdLine="\"" + filePathEXE + "\""; - if (!preparams.empty()) cmdLine += " " + preparams; + if (preparams.length()>0) cmdLine += " " + preparams; - for (size_t i=0;i::const_iterator it=lActions.begin();it!=lActions.end();++it) delete *it; + for (list::iterator it=lActions.begin();it!=lActions.end();it++) delete *it; } // Reads all profiles from the given profiles dir @@ -157,7 +157,7 @@ bool ExtProgStore::SearchProg(Glib::ustring name, Glib::ustring exePath, Glib::u } } - if (!(pAct->filePathEXE.empty())){ + if (pAct->filePathEXE.length()>0){ lActions.push_back(pAct); // Copy for second target diff --git a/rtgui/favoritbrowser.cc b/rtgui/favoritbrowser.cc index 8f63923a1..9b66aad8b 100644 --- a/rtgui/favoritbrowser.cc +++ b/rtgui/favoritbrowser.cc @@ -67,7 +67,7 @@ FavoritBrowser::FavoritBrowser () : listener (NULL), lastSelectedDir ("") { void FavoritBrowser::selectionChanged () { Glib::RefPtr selection = treeView->get_selection(); - Gtk::TreeModel::const_iterator iter = selection->get_selected(); + Gtk::TreeModel::iterator iter = selection->get_selected(); if (iter && listener) listener->selectDir (iter->get_value (favoritColumns.fulldir)); } @@ -79,15 +79,15 @@ void FavoritBrowser::dirSelected (const Glib::ustring& dirname, const Glib::ustr void FavoritBrowser::addPressed () { - if (lastSelectedDir.empty()) + if (lastSelectedDir=="") return; // check if the dirname is already in the list. If yes, return. - Gtk::TreeModel::const_iterator iter = favoritModel->children ().begin(); + Gtk::TreeModel::iterator iter = favoritModel->children ().begin(); while (iter != favoritModel->children().end()) { if (iter->get_value (favoritColumns.fulldir) == lastSelectedDir) return; - ++iter; + iter++; } Glib::RefPtr hfile = Gio::File::create_for_parse_name (lastSelectedDir); diff --git a/rtgui/filebrowser.cc b/rtgui/filebrowser.cc index 7d6ec7059..af3fd6062 100644 --- a/rtgui/filebrowser.cc +++ b/rtgui/filebrowser.cc @@ -113,7 +113,7 @@ FileBrowser::FileBrowser () // Build a list of menu items mMenuExtProgs.clear(); amiExtProg=NULL; - for (std::list::const_iterator it=extProgStore->lActions.begin();it!=extProgStore->lActions.end(); ++it) { + for (std::list::iterator it=extProgStore->lActions.begin();it!=extProgStore->lActions.end();it++) { ExtProgAction* pAct=*it; if (pAct->target==1 || pAct->target==2) mMenuExtProgs[pAct->GetFullName()]=pAct; @@ -132,7 +132,7 @@ FileBrowser::FileBrowser () submenuExtProg->attach (*miOpenDefaultViewer, 0, 1, p, p+1); p++; } - for (std::map::const_iterator it=mMenuExtProgs.begin();it!=mMenuExtProgs.end();++it,++itemNo) { + for (std::map::iterator it=mMenuExtProgs.begin();it!=mMenuExtProgs.end();it++,itemNo++) { submenuExtProg->attach (*Gtk::manage(amiExtProg[itemNo] = new Gtk::MenuItem ((*it).first)), 0, 1, p, p+1); p++; } @@ -143,7 +143,7 @@ FileBrowser::FileBrowser () pmenu->attach (*miOpenDefaultViewer, 0, 1, p, p+1); p++; } - for (std::map::const_iterator it=mMenuExtProgs.begin();it!=mMenuExtProgs.end();++it,++itemNo) { + for (std::map::iterator it=mMenuExtProgs.begin();it!=mMenuExtProgs.end();it++,itemNo++) { pmenu->attach (*Gtk::manage(amiExtProg[itemNo] = new Gtk::MenuItem ((*it).first)), 0, 1, p, p+1); p++; } } @@ -245,7 +245,7 @@ FileBrowser::FileBrowser () for (int i=0; i<6; i++) colorlabel[i]->signal_activate().connect (sigc::bind(sigc::mem_fun(*this, &FileBrowser::menuItemActivated), colorlabel[i])); - for (size_t i=0; isignal_activate().connect (sigc::bind(sigc::mem_fun(*this, &FileBrowser::menuItemActivated), amiExtProg[i])); if (miOpenDefaultViewer!=NULL) { @@ -428,8 +428,8 @@ void FileBrowser::addEntry_ (FileBrowserEntry* entry) { #endif std::vector::iterator i = fd.begin(); - while (i!=fd.end() && *entry < *(static_cast(*i))) - ++i; + while (i!=fd.end() && *entry < *((FileBrowserEntry*)*i)) + i++; fd.insert (i, entry); @@ -444,7 +444,7 @@ FileBrowserEntry* FileBrowser::delEntry (const Glib::ustring& fname) { Glib::RWLock::WriterLock l(entryRW); #endif - for (std::vector::iterator i=fd.begin(); i!=fd.end(); ++i) + for (std::vector::iterator i=fd.begin(); i!=fd.end(); i++) if ((*i)->filename==fname) { ThumbBrowserEntryBase* entry = *i; entry->selected = false; @@ -521,13 +521,13 @@ void FileBrowser::menuItemActivated (Gtk::MenuItem* m) { return; } - for (size_t j=0; jget_label()]; // Build vector of all file names std::vector selFileNames; - for (size_t i=0; ithumbnail->getFileName(); // Maybe batch processed version @@ -711,13 +711,13 @@ void FileBrowser::pasteProfile () { if (clipboard.hasProcParams()) { std::vector mselected; - for (size_t i=0; i(selected[i])); if (!tbl || mselected.empty()) return; - for (size_t i=0; i mselected; - for (size_t i=0; i(selected[i])); if (!tbl || mselected.empty()) @@ -745,7 +745,7 @@ void FileBrowser::partPasteProfile () { int i = partialPasteDlg.run (); if (i == Gtk::RESPONSE_OK) { - for (size_t i=0; ithumbnail->createProcParamsForUpdate(false,false); // this can execute customprofilebuilder to generate param file rtengine::procparams::PartialProfile cbPartProf = clipboard.getPartialProfile(); @@ -904,8 +904,8 @@ bool FileBrowser::checkFilter (ThumbBrowserEntryBase* entryb) { // true -> entry FileBrowserEntry* entry = static_cast(entryb); // return false if basic filter settings are not satisfied - if ((!filter.showRanked[entry->thumbnail->getRank()]) || - (!filter.showCLabeled[entry->thumbnail->getColorLabel()]) || + if ((filter.showRanked[entry->thumbnail->getRank()]==false ) || + (filter.showCLabeled[entry->thumbnail->getColorLabel()]==false ) || ((entry->thumbnail->hasProcParams() && filter.showEdited[0]) && !filter.showEdited[1]) || ((!entry->thumbnail->hasProcParams() && filter.showEdited[1])&& !filter.showEdited[0]) || diff --git a/rtgui/filebrowserentry.cc b/rtgui/filebrowserentry.cc index 6884ef5ae..c6058e25c 100644 --- a/rtgui/filebrowserentry.cc +++ b/rtgui/filebrowserentry.cc @@ -424,7 +424,7 @@ bool FileBrowserEntry::releaseNotify (int button, int type, int bstate, int x, i return b; } -bool FileBrowserEntry::onArea (CursorArea a, int x, int y) const { +bool FileBrowserEntry::onArea (CursorArea a, int x, int y) { if (!drawable || !preview) return false; diff --git a/rtgui/filebrowserentry.h b/rtgui/filebrowserentry.h index 58bdd1ae7..224ddc5c4 100644 --- a/rtgui/filebrowserentry.h +++ b/rtgui/filebrowserentry.h @@ -55,7 +55,7 @@ class FileBrowserEntry : public ThumbBrowserEntryBase, ImgEditState state; - bool onArea (CursorArea a, int x, int y) const; + bool onArea (CursorArea a, int x, int y); void updateCursor (int x, int y); void drawStraightenGuide (Cairo::RefPtr c); void customBackBufferUpdate (Cairo::RefPtr c); diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc index 4956a46bb..091174deb 100644 --- a/rtgui/filecatalog.cc +++ b/rtgui/filecatalog.cc @@ -486,7 +486,7 @@ void FileCatalog::dirSelected (const Glib::ustring& dirname, const Glib::ustring previewsToLoad = 0; previewsLoaded = 0; // if openfile exists, we have to open it first (it is a command line argument) - if (!openfile.empty()) + if (openfile!="") addAndOpenFile (openfile); selectedDirectory = dir->get_parse_name(); @@ -495,7 +495,7 @@ void FileCatalog::dirSelected (const Glib::ustring& dirname, const Glib::ustring buttonBrowsePath->set_image (*iRefreshWhite); fileNameList = getFileList (); - for (size_t i=0; i f = Gio::File::create_for_path(fileNameList[i]); if (f->get_parse_name() != openfile) // if we opened a file at the beginning don't add it again checkAndAddFile (f); @@ -531,7 +531,7 @@ void FileCatalog::_refreshProgressBar () { // Also mention that this progress bar only measures the FIRST pass (quick thumbnails) // The second, usually longer pass is done multithreaded down in the single entries and is NOT measured by this if (!inTabMode) { - Gtk::Notebook *nb = static_cast(filepanel->get_parent()); + Gtk::Notebook *nb =(Gtk::Notebook *)(filepanel->get_parent()); Gtk::Box* hbb=NULL; Gtk::Label *label=NULL; if( options.mainNBVertical ) @@ -725,7 +725,7 @@ void FileCatalog::deleteRequested (std::vector tbe, bool inc msd.set_secondary_text(Glib::ustring::compose ( inclBatchProcessed ? M("FILEBROWSER_DELETEDLGMSGINCLPROC") : M("FILEBROWSER_DELETEDLGMSG"), tbe.size())); if (msd.run()==Gtk::RESPONSE_YES) { - for (size_t i=0; ifilename; // remove from browser FileBrowserEntry* t = fileBrowser->delEntry (fname); @@ -779,7 +779,7 @@ void FileCatalog::copyMoveRequested (std::vector tbe, bool m Glib::ustring dest_Dir = fc.get_current_folder(); // iterate through selected files - for (size_t i=0; ifilename; Glib::ustring src_Dir = Glib::path_get_dirname(src_fPath); Glib::RefPtr src_file = Gio::File::create_for_path ( src_fPath ); @@ -944,7 +944,7 @@ void FileCatalog::renameRequested (std::vector tbe) { bool success; - RenameDialog* renameDlg = new RenameDialog (static_cast(get_toplevel())); + RenameDialog* renameDlg = new RenameDialog ((Gtk::Window*)get_toplevel()); for (size_t i=0; iinitName (Glib::path_get_basename (tbe[i]->filename), tbe[i]->thumbnail->getCacheImageData()); @@ -962,7 +962,7 @@ void FileCatalog::renameRequested (std::vector tbe) { continue; // if no extension is given, concatenate the extension of the original file Glib::ustring ext = getExtension (nBaseName); - if (ext.empty()) + if (ext=="") nBaseName += "." + getExtension (baseName); Glib::ustring nfname = Glib::build_filename (dirName, nBaseName); @@ -987,7 +987,7 @@ void FileCatalog::renameRequested (std::vector tbe) { } delete renameDlg; /* // ask for new file name - Gtk::Dialog dialog (M("FILEBROWSER_RENAMEDLGLABEL"), *(static_cast(get_toplevel())), true, true); + Gtk::Dialog dialog (M("FILEBROWSER_RENAMEDLGLABEL"), *((Gtk::Window*)get_toplevel()), true, true); dialog.add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK); dialog.add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); @@ -1003,7 +1003,7 @@ void FileCatalog::renameRequested (std::vector tbe) { nfentry.set_activates_default (true); dialog.set_default_response (Gtk::RESPONSE_OK); - for (size_t i=0; ifilename; Glib::ustring dirName = Glib::path_get_dirname (tbe[i]->filename); @@ -1040,7 +1040,7 @@ void FileCatalog::clearFromCacheRequested (std::vector tbe, if (tbe.empty()) return; - for (size_t i=0; ifilename; // remove from cache cacheMgr->clearFromCache (fname,leavenotrace); @@ -1315,7 +1315,7 @@ void FileCatalog::filterChanged () { void FileCatalog::reparseDirectory () { - if (selectedDirectory.empty()) + if (selectedDirectory=="") return; if (!safe_file_test (selectedDirectory, Glib::FILE_TEST_IS_DIR)) { @@ -1540,7 +1540,7 @@ void FileCatalog::buttonBrowsePathPressed () { DecodedPathPrefix = safe_get_user_picture_dir(); } - if (!DecodedPathPrefix.empty()){ + if (DecodedPathPrefix!=""){ BrowsePathValue = Glib::ustring::compose ("%1%2",DecodedPathPrefix,BrowsePathValue.substr (1,BrowsePath->get_text_length()-1)); BrowsePath->set_text(BrowsePathValue); } @@ -1590,7 +1590,7 @@ void FileCatalog::tbRightPanel_1_toggled () { } bool FileCatalog::CheckSidePanelsVisibility(){ - if(!tbLeftPanel_1->get_active() && !tbRightPanel_1->get_active()) + if(tbLeftPanel_1->get_active()==false && tbRightPanel_1->get_active()==false) return false; else return true; diff --git a/rtgui/filepanel.cc b/rtgui/filepanel.cc index cb094140b..34041a40d 100644 --- a/rtgui/filepanel.cc +++ b/rtgui/filepanel.cc @@ -136,7 +136,7 @@ void FilePanel::init () { dirBrowser->fillDirTree (); placesBrowser->refreshPlacesList (); - if (!argv1.empty() && safe_file_test (argv1, Glib::FILE_TEST_IS_DIR)) + if (argv1!="" && safe_file_test (argv1, Glib::FILE_TEST_IS_DIR)) dirBrowser->open (argv1); else { if (options.startupDir==STARTUPDIR_HOME) @@ -144,7 +144,7 @@ void FilePanel::init () { else if (options.startupDir==STARTUPDIR_CURRENT) dirBrowser->open (argv0); else if (options.startupDir==STARTUPDIR_CUSTOM || options.startupDir==STARTUPDIR_LAST) { - if (!options.startupPath.empty() && safe_file_test(options.startupPath, Glib::FILE_TEST_EXISTS) && safe_file_test(options.startupPath, Glib::FILE_TEST_IS_DIR)) + if (options.startupPath.length() && safe_file_test(options.startupPath, Glib::FILE_TEST_EXISTS) && safe_file_test(options.startupPath, Glib::FILE_TEST_IS_DIR)) dirBrowser->open (options.startupPath); else { // Fallback option if the path is empty or the folder doesn't exist @@ -207,7 +207,7 @@ void FilePanel::saveOptions () { options.dirBrowserHeight = placespaned->get_position (); options.browserToolPanelWidth = winW - get_position(); options.browserToolPanelHeight = tpcPaned->get_position (); - if (options.startupDir==STARTUPDIR_LAST && !fileCatalog->lastSelectedDir ().empty()) + if (options.startupDir==STARTUPDIR_LAST && fileCatalog->lastSelectedDir ()!="") options.startupPath = fileCatalog->lastSelectedDir (); fileCatalog->closeDir (); } diff --git a/rtgui/filterpanel.cc b/rtgui/filterpanel.cc index ef63af6d3..5c93c1015 100644 --- a/rtgui/filterpanel.cc +++ b/rtgui/filterpanel.cc @@ -203,7 +203,7 @@ void FilterPanel::setFilter (ExifFilterSettings& defefs, bool updateLists) { if( updateLists ){ expcomp->clear_items(); curefs.expcomp.clear(); - for (std::set::const_iterator i = defefs.expcomp.begin(); i!=defefs.expcomp.end(); ++i) { + for (std::set::iterator i = defefs.expcomp.begin(); i!=defefs.expcomp.end(); i++) { expcomp->append_text (*i); curefs.expcomp.insert(*i); } @@ -211,7 +211,7 @@ void FilterPanel::setFilter (ExifFilterSettings& defefs, bool updateLists) { lens->clear_items(); curefs.lenses.clear(); - for (std::set::const_iterator i = defefs.lenses.begin(); i!=defefs.lenses.end(); ++i) { + for (std::set::iterator i = defefs.lenses.begin(); i!=defefs.lenses.end(); i++) { lens->append_text (*i); curefs.lenses.insert(*i); } @@ -219,7 +219,7 @@ void FilterPanel::setFilter (ExifFilterSettings& defefs, bool updateLists) { camera->clear_items(); curefs.cameras.clear(); - for (std::set::const_iterator i = defefs.cameras.begin(); i!=defefs.cameras.end(); ++i) { + for (std::set::iterator i = defefs.cameras.begin(); i!=defefs.cameras.end(); i++) { camera->append_text(*i); curefs.cameras.insert(*i); } @@ -227,13 +227,13 @@ void FilterPanel::setFilter (ExifFilterSettings& defefs, bool updateLists) { filetype->clear_items(); curefs.filetypes.clear(); - for (std::set::const_iterator i = defefs.filetypes.begin(); i!=defefs.filetypes.end(); ++i) { + for (std::set::iterator i = defefs.filetypes.begin(); i!=defefs.filetypes.end(); i++) { filetype->append_text(*i); curefs.filetypes.insert(*i); } ftselection->select_all(); }else{ - for( Gtk::TreeModel::Children::const_iterator iter = expcomp->get_model()->children().begin(); iter != expcomp->get_model()->children().end();++iter){ + for( Gtk::TreeModel::Children::iterator iter = expcomp->get_model()->children().begin(); iter != expcomp->get_model()->children().end();iter++){ Glib::ustring v; iter->get_value(0,v); if( defefs.expcomp.find( v ) != defefs.expcomp.end() ) @@ -241,7 +241,7 @@ void FilterPanel::setFilter (ExifFilterSettings& defefs, bool updateLists) { else eselection->unselect( iter ); } - for( Gtk::TreeModel::Children::const_iterator iter = lens->get_model()->children().begin(); iter != lens->get_model()->children().end();++iter){ + for( Gtk::TreeModel::Children::iterator iter = lens->get_model()->children().begin(); iter != lens->get_model()->children().end();iter++){ Glib::ustring v; iter->get_value(0,v); if( defefs.lenses.find( v ) != defefs.lenses.end() ) @@ -249,7 +249,7 @@ void FilterPanel::setFilter (ExifFilterSettings& defefs, bool updateLists) { else lselection->unselect( iter ); } - for( Gtk::TreeModel::Children::const_iterator iter = camera->get_model()->children().begin(); iter != camera->get_model()->children().end();++iter){ + for( Gtk::TreeModel::Children::iterator iter = camera->get_model()->children().begin(); iter != camera->get_model()->children().end();iter++){ Glib::ustring v; iter->get_value(0,v); if( defefs.cameras.find( v ) != defefs.cameras.end() ) @@ -257,7 +257,7 @@ void FilterPanel::setFilter (ExifFilterSettings& defefs, bool updateLists) { else cselection->unselect(iter); } - for( Gtk::TreeModel::Children::const_iterator iter = filetype->get_model()->children().begin(); iter != filetype->get_model()->children().end();++iter){ + for( Gtk::TreeModel::Children::iterator iter = filetype->get_model()->children().begin(); iter != filetype->get_model()->children().end();iter++){ Glib::ustring v; iter->get_value(0,v); if( defefs.filetypes.find( v ) != defefs.filetypes.end() ) diff --git a/rtgui/flatcurveeditorsubgroup.cc b/rtgui/flatcurveeditorsubgroup.cc index 9531d177c..7974395b1 100644 --- a/rtgui/flatcurveeditorsubgroup.cc +++ b/rtgui/flatcurveeditorsubgroup.cc @@ -117,7 +117,7 @@ void FlatCurveEditorSubGroup::switchGUI() { void FlatCurveEditorSubGroup::savePressed () { Glib::ustring fname = outputFile(); - if (!fname.empty()) { + if (fname.size()) { std::ofstream f (fname.c_str()); std::vector p; //std::vector p = customCurve->getPoints (); @@ -136,7 +136,7 @@ void FlatCurveEditorSubGroup::savePressed () { else if (p[ix]==(double)(FCT_MinMaxCPoints)) f << "ControlPoints\n"; ix++; - for (size_t i=0; i p; @@ -203,7 +203,7 @@ void FlatCurveEditorSubGroup::restoreDisplayedHistogram() { void FlatCurveEditorSubGroup::storeCurveValues (CurveEditor* ce, const std::vector& p) { if (!p.empty()) { FlatCurveType t = static_cast(p[0]); - for (size_t i=0; i(ce); + CurveEditor* fce = (CurveEditor*)ce; if (fce==displayedCurve) { paramCurve->updateBackgroundHistogram (fce->bgHistValid ? fce->histogram : NULL); customCurve->updateBackgroundHistogram (fce->bgHistValid ? fce->histogram : NULL); diff --git a/rtgui/guiutils.cc b/rtgui/guiutils.cc index a40ef5cb6..35555ff4f 100644 --- a/rtgui/guiutils.cc +++ b/rtgui/guiutils.cc @@ -27,8 +27,8 @@ using namespace std; bool removeIfThere (Gtk::Container* cont, Gtk::Widget* w, bool increference) { Glib::ListHandle list = cont->get_children (); - Glib::ListHandle::const_iterator i = list.begin (); - for (; i!=list.end() && *i!=w; ++i); + Glib::ListHandle::iterator i = list.begin (); + for (; i!=list.end() && *i!=w; i++); if (i!=list.end()) { if (increference) w->reference (); diff --git a/rtgui/histogrampanel.cc b/rtgui/histogrampanel.cc index 50d71cd97..eacac58b1 100644 --- a/rtgui/histogrampanel.cc +++ b/rtgui/histogrampanel.cc @@ -164,7 +164,7 @@ void HistogramPanel::resized (Gtk::Allocation& req) { histogramArea->renderHistogram (); histogramArea->queue_draw (); - if (histogramRGBArea->getFreeze()) { + if (histogramRGBArea->getFreeze()==true) { histogramRGBArea->updateFreeze(false); // set histogramRGBArea invalid; histogramRGBArea->renderRGBMarks(-1, -1, -1); @@ -231,10 +231,10 @@ void HistogramPanel::setHistRGBInvalid () { // "Freeze" is not a button, but a RMB-click, so this is not in the RGBV-Toggle method void HistogramPanel::toggleFreeze () { - if (histogramRGBArea->getFreeze()) { + if (histogramRGBArea->getFreeze()==true) { histogramRGBArea->updateFreeze(false); } - else if (histogramRGBArea->getShow()) { + else if (histogramRGBArea->getShow()==true) { histogramRGBArea->updateFreeze(true); } return; diff --git a/rtgui/history.cc b/rtgui/history.cc index f5f4750fd..e9212c3e6 100644 --- a/rtgui/history.cc +++ b/rtgui/history.cc @@ -138,7 +138,7 @@ void History::clearParamChanges () { void History::historySelectionChanged () { Glib::RefPtr selection = hTreeView->get_selection(); - Gtk::TreeModel::const_iterator iter = selection->get_selected(); + Gtk::TreeModel::iterator iter = selection->get_selected(); if (iter) { Gtk::TreeModel::Row row = *iter; if (row) @@ -151,7 +151,7 @@ void History::historySelectionChanged () { ParamsEdited paramsEdited = row[historyColumns.paramsEdited]; tpc->profileChange (&pp, EvHistoryBrowsed, row[historyColumns.text], ¶msEdited); } - if (blistener && !blistenerLock) { + if (blistener && blistenerLock==false) { Gtk::TreeModel::Path path = historyModel->get_path (iter); path.prev (); iter = historyModel->get_iter (path); @@ -164,7 +164,7 @@ void History::historySelectionChanged () { void History::bookmarkSelectionChanged () { Glib::RefPtr selection = bTreeView->get_selection(); - Gtk::TreeModel::const_iterator iter = selection->get_selected(); + Gtk::TreeModel::iterator iter = selection->get_selected(); if (iter) { Gtk::TreeModel::Row row = *iter; if (row) @@ -194,10 +194,10 @@ void History::procParamsChanged (ProcParams* params, ProcEvent ev, Glib::ustring Glib::ustring text = Glib::ustring::compose ("%1", eventDescrArray[ev]); Glib::RefPtr selection = hTreeView->get_selection(); - Gtk::TreeModel::const_iterator iter = selection->get_selected(); + Gtk::TreeModel::iterator iter = selection->get_selected(); // remove all rows after the selection if (iter) { - ++iter; + iter++; while (iter) iter = historyModel->erase (iter); } @@ -217,9 +217,9 @@ void History::procParamsChanged (ProcParams* params, ProcEvent ev, Glib::ustring newrow[historyColumns.paramsEdited] = paramsEdited ? *paramsEdited : defParamsEdited; if (ev!=EvBookmarkSelected) selection->select (newrow); - if (blistener && row && !blistenerLock) + if (blistener && row && blistenerLock==false) blistener->historyBeforeLineChanged (row[historyColumns.params]); - else if (blistener && size==0 && !blistenerLock) + else if (blistener && size==0 && blistenerLock==false) blistener->historyBeforeLineChanged (newrow[historyColumns.params]); } // else just update it @@ -248,7 +248,7 @@ void History::addBookmarkWithText (Glib::ustring text) { // lookup the selected item in the history Glib::RefPtr selection = hTreeView->get_selection(); - Gtk::TreeModel::const_iterator iter = selection->get_selected(); + Gtk::TreeModel::iterator iter = selection->get_selected(); Gtk::TreeModel::Row row = *iter; if (!row) { @@ -274,7 +274,7 @@ void History::delBookmarkPressed () { // lookup the selected item in the bookmark Glib::RefPtr selection = bTreeView->get_selection(); - Gtk::TreeModel::const_iterator iter = selection->get_selected(); + Gtk::TreeModel::iterator iter = selection->get_selected(); if (!iter) { return; @@ -290,7 +290,7 @@ void History::delBookmarkPressed () { void History::undo () { Glib::RefPtr selection = hTreeView->get_selection(); - Gtk::TreeModel::const_iterator iter = selection->get_selected(); + Gtk::TreeModel::iterator iter = selection->get_selected(); if (iter && iter!=historyModel->children().begin()) selection->select (--iter); @@ -304,10 +304,10 @@ void History::undo () { void History::redo () { Glib::RefPtr selection = hTreeView->get_selection(); - Gtk::TreeModel::const_iterator iter = selection->get_selected(); + Gtk::TreeModel::iterator iter = selection->get_selected(); if (iter) { - ++iter; + iter++; if (iter!=historyModel->children().end()) selection->select (iter); } diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc index cf2aaf15b..1c3699d4b 100644 --- a/rtgui/icmpanel.cc +++ b/rtgui/icmpanel.cc @@ -217,7 +217,7 @@ void ICMPanel::read (const ProcParams* pp, const ParamsEdited* pedited) { inone->set_active (true); prefprof->set_sensitive (false); ckbBlendCMSMatrix->set_sensitive (false); } - else if (pp->icm.input == "(embedded)" || ((pp->icm.input == "(camera)" || pp->icm.input.empty()) && icamera->get_state()==Gtk::STATE_INSENSITIVE)) { + else if (pp->icm.input == "(embedded)" || ((pp->icm.input == "(camera)" || pp->icm.input=="") && icamera->get_state()==Gtk::STATE_INSENSITIVE)) { iembedded->set_active (true); prefprof->set_sensitive (false); ckbBlendCMSMatrix->set_sensitive (false); } @@ -232,7 +232,7 @@ void ICMPanel::read (const ProcParams* pp, const ParamsEdited* pedited) { prefprof->set_sensitive (false); // RT's own are always single-illuminant ckbBlendCMSMatrix->set_sensitive (false); } - else if ((pp->icm.input == "(camera)" || pp->icm.input.empty()) && icamera->get_state()!=Gtk::STATE_INSENSITIVE) { + else if ((pp->icm.input == "(camera)" || pp->icm.input=="") && icamera->get_state()!=Gtk::STATE_INSENSITIVE) { icamera->set_active (true); ckbBlendCMSMatrix->set_sensitive (false); prefprof->set_sensitive (false); } @@ -478,7 +478,7 @@ void ICMPanel::setRawMeta (bool raw, const rtengine::ImageData* pMeta) { void ICMPanel::ipSelectionChanged () { - if (ipDialog->get_filename().empty()) + if (ipDialog->get_filename () == "") return; ipChanged (); diff --git a/rtgui/imagearea.cc b/rtgui/imagearea.cc index d88fefea1..e56fc44ea 100644 --- a/rtgui/imagearea.cc +++ b/rtgui/imagearea.cc @@ -54,7 +54,7 @@ ImageArea::ImageArea (ImageAreaPanel* p) : parent(p) { ImageArea::~ImageArea () { - for (std::list::const_iterator i=cropWins.begin(); i!=cropWins.end(); ++i) + for (std::list::iterator i=cropWins.begin(); i!=cropWins.end(); i++) delete *i; cropWins.clear (); @@ -96,12 +96,12 @@ void ImageArea::on_resized (Gtk::Allocation& req) { void ImageArea::setImProcCoordinator (rtengine::StagedImageProcessor* ipc_) { if( !ipc_ ){ focusGrabber = NULL; - std::list::const_iterator i = cropWins.begin(); + std::list::iterator i = cropWins.begin(); if( i!=cropWins.end() ){ (*i)->getPosition (lastClosedX, lastClosedY); (*i)->getSize (lastClosedW, lastClosedH); } - for( ;i!=cropWins.end();++i ){ + for( ;i!=cropWins.end();i++ ){ delete *i; } cropWins.clear(); @@ -151,7 +151,7 @@ void ImageArea::infoEnabled (bool e) { CropWindow* ImageArea::getCropWindow (int x, int y) { CropWindow* cw = mainCropWindow; - for (std::list::const_iterator i=cropWins.begin(); i!=cropWins.end(); ++i) + for (std::list::iterator i=cropWins.begin(); i!=cropWins.end(); i++) if ((*i)->isInside (x, y)) return *i; return cw; @@ -178,7 +178,7 @@ bool ImageArea::on_expose_event(GdkEventExpose* event) { if (mainCropWindow) mainCropWindow->expose (cr); - if (options.showInfo && !infotext.empty()) { + if (options.showInfo==true && infotext!="") { int fnw, fnh; ilayout->get_pixel_size (fnw, fnh); window->draw_pixbuf (get_style()->get_base_gc (Gtk::STATE_NORMAL), ipixbuf, 0, 0, 4, 4, fnw+8, fnh+8, Gdk::RGB_DITHER_NONE, 0, 0); @@ -188,7 +188,7 @@ bool ImageArea::on_expose_event(GdkEventExpose* event) { cr->fill (); } - for (std::list::reverse_iterator i=cropWins.rbegin(); i!=cropWins.rend(); ++i) + for (std::list::reverse_iterator i=cropWins.rbegin(); i!=cropWins.rend(); i++) (*i)->expose (cr); return true; @@ -429,7 +429,7 @@ void ImageArea::syncBeforeAfterViews () { void ImageArea::setCropGUIListener (CropGUIListener* l) { cropgl = l; - for (std::list::const_iterator i=cropWins.begin(); i!=cropWins.end(); ++i) + for (std::list::iterator i=cropWins.begin(); i!=cropWins.end(); i++) (*i)->setCropGUIListener (cropgl); if (mainCropWindow) mainCropWindow->setCropGUIListener (cropgl); @@ -438,7 +438,7 @@ void ImageArea::setCropGUIListener (CropGUIListener* l) { void ImageArea::setPointerMotionListener (PointerMotionListener* pml) { pmlistener = pml; - for (std::list::const_iterator i=cropWins.begin(); i!=cropWins.end(); ++i) + for (std::list::iterator i=cropWins.begin(); i!=cropWins.end(); i++) (*i)->setPointerMotionListener (pml); if (mainCropWindow) mainCropWindow->setPointerMotionListener (pml); @@ -447,7 +447,7 @@ void ImageArea::setPointerMotionListener (PointerMotionListener* pml) { void ImageArea::setPointerMotionHListener (PointerMotionListener* pml) { pmhlistener = pml; - for (std::list::const_iterator i=cropWins.begin(); i!=cropWins.end(); ++i) + for (std::list::iterator i=cropWins.begin(); i!=cropWins.end(); i++) (*i)->setPointerMotionHListener (pml); if (mainCropWindow) mainCropWindow->setPointerMotionHListener (pml); diff --git a/rtgui/iptcpanel.cc b/rtgui/iptcpanel.cc index a6574efb8..6a9bfd5ac 100644 --- a/rtgui/iptcpanel.cc +++ b/rtgui/iptcpanel.cc @@ -378,20 +378,20 @@ void IPTCPanel::addKeyWord () { keyword->get_entry()->select_region (0, keyword->get_entry()->get_text().size()); - for (size_t i=0; isize(); i++) + for (unsigned int i=0; isize(); i++) if (keywords->get_text (i) == keyword->get_entry()->get_text()) return; keywords->append_text (keyword->get_entry()->get_text()); keyword->prepend_text (keyword->get_entry()->get_text()); std::vector items; - for (Gtk::TreeModel::const_iterator i = keyword->get_model()->children().begin(); i!=keyword->get_model()->children().end(); ++i) { + for (Gtk::TreeModel::iterator i = keyword->get_model()->children().begin(); i!=keyword->get_model()->children().end(); i++) { Glib::ustring s; i->get_value (0, s); items.push_back (s); } keyword->clear_items (); - for (size_t i=0; i<10 && iappend_text (items[i]); keywords->scroll_to_row (keywords->get_model()->get_path(--keywords->get_model()->children().end())); @@ -403,11 +403,11 @@ void IPTCPanel::delKeyWord () { std::vector selection = keywords->get_selected (); if (!selection.empty()) { std::vector keep; - for (size_t i=0; isize(); i++) + for (unsigned int i=0; isize(); i++) if (std::find (selection.begin(), selection.end(), i) == selection.end()) keep.push_back (keywords->get_text (i)); keywords->clear_items (); - for (size_t i=0; iappend_text (keep[i]); } @@ -416,20 +416,20 @@ void IPTCPanel::delKeyWord () { void IPTCPanel::addSuppCategory () { - for (size_t i=0; isize(); i++) + for (unsigned int i=0; isize(); i++) if (suppCategories->get_text (i) == suppCategory->get_entry()->get_text()) return; suppCategories->append_text (suppCategory->get_entry()->get_text()); suppCategory->prepend_text (suppCategory->get_entry()->get_text()); std::vector items; - for (Gtk::TreeModel::const_iterator i = suppCategory->get_model()->children().begin(); i!=suppCategory->get_model()->children().end(); ++i) { + for (Gtk::TreeModel::iterator i = suppCategory->get_model()->children().begin(); i!=suppCategory->get_model()->children().end(); i++) { Glib::ustring s; i->get_value (0, s); items.push_back (s); } suppCategory->clear_items (); - for (size_t i=0; i<10 && iappend_text (items[i]); suppCategories->scroll_to_row (suppCategories->get_model()->get_path(--suppCategories->get_model()->children().end())); suppCategory->get_entry()->select_region (0, suppCategory->get_entry()->get_text().size()); @@ -442,11 +442,11 @@ void IPTCPanel::delSuppCategory () { std::vector selection = suppCategories->get_selected (); if (!selection.empty()) { std::vector keep; - for (size_t i=0; isize(); i++) + for (unsigned int i=0; isize(); i++) if (std::find (selection.begin(), selection.end(), i) == selection.end()) keep.push_back (suppCategories->get_text (i)); suppCategories->clear_items (); - for (size_t i=0; iappend_text (keep[i]); } @@ -461,12 +461,12 @@ void IPTCPanel::updateChangeList () { changeList["Headline" ].push_back (headline->get_text ()); changeList["Instructions" ].push_back (instructions->get_text ()); - for (size_t i=0; isize(); i++) + for (unsigned int i=0; isize(); i++) changeList["Keywords" ].push_back (keywords->get_text (i)); changeList["Category" ].push_back (category->get_entry()->get_text ()); - for (size_t i=0; isize(); i++) + for (unsigned int i=0; isize(); i++) changeList["SupplementalCategories"].push_back (suppCategories->get_text (i)); changeList["Author" ].push_back (author->get_text ()); @@ -510,7 +510,7 @@ void IPTCPanel::applyChangeList () { keyword->get_entry()->set_text (""); suppCategory->get_entry()->set_text (""); - for (rtengine::procparams::IPTCPairs::const_iterator i=changeList.begin(); i!=changeList.end(); i++) { + for (rtengine::procparams::IPTCPairs::iterator i=changeList.begin(); i!=changeList.end(); i++) { if (i->first == "Caption" && !i->second.empty()) captionText->set_text (i->second.at(0)); else if (i->first == "CaptionWriter" && !i->second.empty()) @@ -520,12 +520,12 @@ void IPTCPanel::applyChangeList () { else if (i->first == "Instructions" && !i->second.empty()) instructions->set_text (i->second.at(0)); else if (i->first == "Keywords") - for (size_t j=0; jsecond.size(); j++) + for (unsigned int j=0; jsecond.size(); j++) keywords->append_text (i->second.at(j)); else if (i->first == "Category" && !i->second.empty()) category->get_entry()->set_text (i->second.at(0)); else if (i->first == "SupplementalCategories") - for (size_t j=0; jsecond.size(); j++) + for (unsigned int j=0; jsecond.size(); j++) suppCategories->append_text (i->second.at(j)); else if (i->first == "Author" && !i->second.empty()) author->set_text (i->second.at(0)); diff --git a/rtgui/lwbutton.cc b/rtgui/lwbutton.cc index 3b82f7cdf..628c7fa6e 100644 --- a/rtgui/lwbutton.cc +++ b/rtgui/lwbutton.cc @@ -29,7 +29,7 @@ LWButton::LWButton (Cairo::RefPtr i, int aCode, void* aData w = h = 2; } -void LWButton::getSize (int& minw, int& minh) const { +void LWButton::getSize (int& minw, int& minh) { minw = w; minh = h; @@ -41,7 +41,7 @@ void LWButton::setPosition (int x, int y) { ypos = y; } -void LWButton::getPosition (int& x, int& y) const { +void LWButton::getPosition (int& x, int& y) { x = xpos; y = ypos; @@ -58,7 +58,7 @@ void LWButton::setIcon (Cairo::RefPtr i) { w = h = 2; } -Cairo::RefPtr LWButton::getIcon () const { +Cairo::RefPtr LWButton::getIcon () { return icon; } @@ -73,7 +73,7 @@ void LWButton::setColors (const Gdk::Color& bg, const Gdk::Color& fg) { fgb = fg.get_blue_p (); } -bool LWButton::inside (int x, int y) const { +bool LWButton::inside (int x, int y) { return x>xpos && xypos && y context) { } } -void LWButton::getAlignment (Alignment& ha, Alignment& va) const { +void LWButton::getAlignment (Alignment& ha, Alignment& va) { ha = halign; va = valign; } -Glib::ustring LWButton::getToolTip (int x, int y) const { +Glib::ustring LWButton::getToolTip (int x, int y) { if (inside (x, y)) return toolTip; diff --git a/rtgui/lwbutton.h b/rtgui/lwbutton.h index a6b95f09f..23ff322a6 100644 --- a/rtgui/lwbutton.h +++ b/rtgui/lwbutton.h @@ -50,13 +50,13 @@ class LWButton { public: LWButton (Cairo::RefPtr i, int aCode, void* aData, Alignment ha=Left, Alignment va=Center, Glib::ustring tooltip=""); - void getSize (int& minw, int& minh) const; - void getAlignment (Alignment& ha, Alignment& va) const; + void getSize (int& minw, int& minh); + void getAlignment (Alignment& ha, Alignment& va); void setPosition (int x, int y); - void getPosition (int& x, int& y) const; - bool inside (int x, int y) const; + void getPosition (int& x, int& y); + bool inside (int x, int y); void setIcon (Cairo::RefPtr i); - Cairo::RefPtr getIcon () const; + Cairo::RefPtr getIcon (); void setColors (const Gdk::Color& bg, const Gdk::Color& fg); void setToolTip (const Glib::ustring& tooltip); @@ -64,7 +64,7 @@ class LWButton { bool pressNotify (int x, int y); bool releaseNotify (int x, int y); - Glib::ustring getToolTip (int x, int y) const; + Glib::ustring getToolTip (int x, int y); void setButtonListener (LWButtonListener* bl) { listener = bl; } diff --git a/rtgui/lwbuttonset.cc b/rtgui/lwbuttonset.cc index d44d1093e..b024e0914 100644 --- a/rtgui/lwbuttonset.cc +++ b/rtgui/lwbuttonset.cc @@ -32,7 +32,7 @@ void LWButtonSet::add (LWButton* b) { buttons.push_back (b); } -void LWButtonSet::getMinimalDimensions (int& w, int& h) const { +void LWButtonSet::getMinimalDimensions (int& w, int& h) { w=0; h=0; for (size_t i=0; isetButtonListener (bl); } -void LWButtonSet::getAllocatedDimensions (int& w, int& h) const { +void LWButtonSet::getAllocatedDimensions (int& w, int& h) { w = aw; h = ah; @@ -162,7 +162,7 @@ Glib::ustring LWButtonSet::getToolTip (int x, int y) { for (size_t i=0; igetToolTip (x, y); - if (!ttip.empty()) + if (ttip!="") return ttip; } return ""; diff --git a/rtgui/lwbuttonset.h b/rtgui/lwbuttonset.h index 6e45e45ca..651304c83 100644 --- a/rtgui/lwbuttonset.h +++ b/rtgui/lwbuttonset.h @@ -34,8 +34,8 @@ class LWButtonSet { void add (LWButton* b); - void getMinimalDimensions (int& w, int& h) const; - void getAllocatedDimensions (int& w, int& h) const; + void getMinimalDimensions (int& w, int& h); + void getAllocatedDimensions (int& w, int& h); void arrangeButtons (int x, int y, int w, int h); void setColors (const Gdk::Color& bg, const Gdk::Color& fg); bool motionNotify (int x, int y); diff --git a/rtgui/main.cc b/rtgui/main.cc index aba8c9b48..174a9aa3d 100644 --- a/rtgui/main.cc +++ b/rtgui/main.cc @@ -167,7 +167,7 @@ int main(int argc, char **argv) } void deleteProcParams(std::vector &pparams) { - for (size_t i=0; ideleteInstance(); delete pparams[i]; pparams[i] = NULL; @@ -326,7 +326,7 @@ int processLineParams( int argc, char **argv ) } else { options.saveUsePathTemplate = true; - if (options.savePathTemplate.empty()) + if (!options.savePathTemplate.length()) // If the save path template is empty, we use its default value options.savePathTemplate = "%p1/converted/%f"; } diff --git a/rtgui/multilangmgr.cc b/rtgui/multilangmgr.cc index 40189efb4..0b44abe39 100644 --- a/rtgui/multilangmgr.cc +++ b/rtgui/multilangmgr.cc @@ -85,8 +85,8 @@ bool MultiLangMgr::save (Glib::ustring fname) { if (f==NULL) return false; - std::map::const_iterator r; - for (r=transTable.begin (); r!=transTable.end(); ++r) + std::map::iterator r; + for (r=transTable.begin (); r!=transTable.end(); r++) fprintf (f, "%s;%s\n", r->first.c_str(), safe_locale_from_utf8(r->second).c_str()); fclose (f); @@ -94,7 +94,7 @@ bool MultiLangMgr::save (Glib::ustring fname) { } -bool MultiLangMgr::isOSLanguageDetectSupported() const { +bool MultiLangMgr::isOSLanguageDetectSupported() { #ifdef WIN32 #ifdef __MINGW64_VERSION_MAJOR // Only on Vista or above @@ -175,7 +175,7 @@ Glib::ustring MultiLangMgr::TranslateRFC2Language(Glib::ustring rfcName) { Glib::ustring MultiLangMgr::getStr (std::string key) { - std::map::const_iterator r = transTable.find (key); + std::map::iterator r = transTable.find (key); if (r!=transTable.end()) return r->second; else if (fallBack) diff --git a/rtgui/multilangmgr.h b/rtgui/multilangmgr.h index 9e8fce094..2f2dc500a 100644 --- a/rtgui/multilangmgr.h +++ b/rtgui/multilangmgr.h @@ -38,7 +38,7 @@ class MultiLangMgr { bool load (Glib::ustring fname, MultiLangMgr* fb = NULL); bool save (Glib::ustring fname); - bool isOSLanguageDetectSupported() const ; + bool isOSLanguageDetectSupported(); Glib::ustring getOSUserLanguage(); Glib::ustring getStr (std::string key); diff --git a/rtgui/mydiagonalcurve.cc b/rtgui/mydiagonalcurve.cc index a2fdfa4ce..d7cd24771 100644 --- a/rtgui/mydiagonalcurve.cc +++ b/rtgui/mydiagonalcurve.cc @@ -57,7 +57,7 @@ std::vector MyDiagonalCurve::get_vector (int veclen) { double prev =- 1.0; int active = 0; int firstact = -1; - for (size_t i = 0; i < curve.x.size(); ++i) + for (int i = 0; i < (int)curve.x.size(); ++i) if (curve.x[i] > prev) { if (firstact < 0) firstact = i; @@ -125,7 +125,7 @@ void MyDiagonalCurve::draw (int handle) { return; // re-calculate curve if dimensions changed - if (prevInnerHeight != innerHeight || point.size() != innerWidth) + if (prevInnerHeight != innerHeight || (int)point.size() != innerWidth) interpolate (); Gtk::StateType state = !is_sensitive() ? Gtk::STATE_INSENSITIVE : Gtk::STATE_NORMAL; @@ -198,10 +198,10 @@ void MyDiagonalCurve::draw (int handle) { if (curve.type==DCT_Parametric && activeParam>0 && lpoint.size()>1 && upoint.size()>1) { cr->set_source_rgba (0.0, 0.0, 0.0, 0.15); cr->move_to (upoint[0].get_x(), upoint[0].get_y()); - for (size_t i=1; iline_to (upoint[i].get_x(), upoint[i].get_y()); cr->line_to (lpoint[lpoint.size()-1].get_x(), lpoint[lpoint.size()-1].get_y()); - for (size_t i=lpoint.size()-2; i>=0; i--) + for (int i=(int)lpoint.size()-2; i>=0; i--) cr->line_to (lpoint[i].get_x(), lpoint[i].get_y()); cr->line_to (upoint[0].get_x(), upoint[0].get_y()); cr->fill (); @@ -209,13 +209,13 @@ void MyDiagonalCurve::draw (int handle) { // draw the cage of the NURBS curve if (curve.type==DCT_NURBS) { - size_t nbPoints; + unsigned int nbPoints; std::valarray ch_ds (1); ch_ds[0] = 2; cr->set_dash (ch_ds, 0); cr->set_source_rgb (c.get_red_p(), c.get_green_p(), c.get_blue_p()); std::vector points = getPoints(); - nbPoints = (points.size()-1)/2; + nbPoints = ((int)points.size()-1)/2; for (unsigned int i = 1; i < nbPoints; i++) { int pos = i*2+1; @@ -239,13 +239,13 @@ void MyDiagonalCurve::draw (int handle) { // draw curve cr->set_source_rgb (c.get_red_p(), c.get_green_p(), c.get_blue_p()); cr->move_to (point[0].get_x(), point[0].get_y()); - for (size_t i=1; iline_to (point[i].get_x(), point[i].get_y()); cr->stroke (); // draw bullets if (curve.type!=DCT_Parametric) - for (size_t i = 0; i < curve.x.size(); ++i) { + for (int i = 0; i < (int)curve.x.size(); ++i) { if (curve.x[i] == -1) continue; if (snapToElmt >= 1000) { int pt = snapToElmt-1000; @@ -285,7 +285,7 @@ bool MyDiagonalCurve::handleEvents (GdkEvent* event) { std::vector::iterator itx, ity; bool retval = false; - size_t num = curve.x.size(); + int num = (int)curve.x.size(); /* innerWidth and innerHeight are the size of the graph */ innerWidth = get_allocation().get_width() - RADIUS * 2; @@ -344,7 +344,7 @@ bool MyDiagonalCurve::handleEvents (GdkEvent* event) { } itx = curve.x.begin(); ity = curve.y.begin(); - for (int i=0; i MyDiagonalCurve::getPoints () { std::vector result; if (curve.type==DCT_Parametric) { result.push_back ((double)(DCT_Parametric)); - for (size_t i=0; i MyDiagonalCurve::getPoints () { else if (curve.type==DCT_NURBS) result.push_back ((double)(DCT_NURBS)); // then we push all the points coordinate - for (size_t i=0; i=0) { result.push_back (curve.x[i]); result.push_back (curve.y[i]); @@ -672,13 +672,13 @@ void MyDiagonalCurve::setPoints (const std::vector& p) { if (t==DCT_Parametric) { curve.x.clear (); curve.y.clear (); - for (size_t i=1; iset_source_rgb (c.get_red_p(), c.get_green_p(), c.get_blue_p()); cr->move_to (point[0].get_x(), point[0].get_y()); - for (size_t i=1; iline_to (point[i].get_x(), point[i].get_y()); cr->stroke (); // draw bullets //if (curve.type!=FCT_Parametric) - for (size_t i = 0; i < curve.x.size(); ++i) { + for (int i = 0; i < (int)curve.x.size(); ++i) { if (curve.x[i] != -1.) { if (i == lit_point) { if (colorProvider) { @@ -422,7 +422,7 @@ void MyFlatCurve::draw () { * Return the X1, X2, Y position of the tangential handles. */ bool MyFlatCurve::getHandles(int n) { - size_t N = curve.x.size(); + int N = curve.x.size(); double prevX, nextX; double prevY, nextY; double prevTan, nextTan; @@ -488,7 +488,7 @@ bool MyFlatCurve::handleEvents (GdkEvent* event) { snapToElmt = -100; bool retval = false; - size_t num = curve.x.size(); + int num = (int)curve.x.size(); /* innerWidth and innerHeight are the size of the graph */ innerWidth = get_allocation().get_width() - 2*RADIUS - 1; @@ -555,7 +555,7 @@ bool MyFlatCurve::handleEvents (GdkEvent* event) { ity = curve.y.begin(); itlt = curve.leftTangent.begin(); itrt = curve.rightTangent.begin(); - for (int i=0; i0 ? dX : -dX; @@ -1230,7 +1230,7 @@ std::vector MyFlatCurve::getPoints () { std::vector result; /*if (curve.type==FCT_Parametric) { result.push_back ((double)(Parametric)); - for (size_t i=0; i MyFlatCurve::getPoints () { else if (curve.type==FCT_MinMaxCPoints) result.push_back ((double)(FCT_MinMaxCPoints)); // then we push all the points coordinate - for (size_t i=0; i=0) { result.push_back (curve.x[i]); result.push_back (curve.y[i]); @@ -1262,7 +1262,7 @@ void MyFlatCurve::setPoints (const std::vector& p) { curve.y.clear (); curve.leftTangent.clear(); curve.rightTangent.clear(); - for (size_t i=0; i=parseExtensionsEnabled.size() || parseExtensionsEnabled[j]; + return j>=(int)parseExtensionsEnabled.size() || parseExtensionsEnabled[j]; return false; } diff --git a/rtgui/paramsedited.cc b/rtgui/paramsedited.cc index 3e06a7a9e..02be0b244 100644 --- a/rtgui/paramsedited.cc +++ b/rtgui/paramsedited.cc @@ -594,13 +594,13 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten // Exif changes are added to the existing ones if (exif) - for (procparams::ExifPairs::const_iterator i=mods.exif.begin(); i!=mods.exif.end(); ++i) { + for (procparams::ExifPairs::const_iterator i=mods.exif.begin(); i!=mods.exif.end(); i++) { toEdit.exif[i->first] = i->second; } // IPTC changes are added to the existing ones if (iptc) - for (procparams::IPTCPairs::const_iterator i=mods.iptc.begin(); i!=mods.iptc.end(); ++i) { + for (procparams::IPTCPairs::const_iterator i=mods.iptc.begin(); i!=mods.iptc.end(); i++) { toEdit.iptc[i->first] = i->second; } } diff --git a/rtgui/placesbrowser.cc b/rtgui/placesbrowser.cc index 809631b77..f0d650a90 100644 --- a/rtgui/placesbrowser.cc +++ b/rtgui/placesbrowser.cc @@ -243,7 +243,7 @@ void PlacesBrowser::driveChanged (const Glib::RefPtr& m) { void PlacesBrowser::selectionChanged () { Glib::RefPtr selection = treeView->get_selection(); - Gtk::TreeModel::const_iterator iter = selection->get_selected(); + Gtk::TreeModel::iterator iter = selection->get_selected(); if (iter) { if (iter->get_value (placesColumns.type)==2) { std::vector > volumes = vm->get_volumes (); @@ -273,7 +273,7 @@ void PlacesBrowser::dirSelected (const Glib::ustring& dirname, const Glib::ustri void PlacesBrowser::addPressed () { - if (lastSelectedDir.empty()) + if (lastSelectedDir=="") return; // check if the dirname is already in the list. If yes, return. @@ -296,7 +296,7 @@ void PlacesBrowser::delPressed () { // lookup the selected item in the bookmark Glib::RefPtr selection = treeView->get_selection(); - Gtk::TreeModel::const_iterator iter = selection->get_selected(); + Gtk::TreeModel::iterator iter = selection->get_selected(); if (iter && iter->get_value (placesColumns.type)==5) { std::vector::iterator i = std::find (options.favoriteDirs.begin(), options.favoriteDirs.end(), iter->get_value (placesColumns.root)); diff --git a/rtgui/popupcommon.cc b/rtgui/popupcommon.cc index 74548ec90..45678b0ab 100644 --- a/rtgui/popupcommon.cc +++ b/rtgui/popupcommon.cc @@ -33,7 +33,7 @@ PopUpCommon::PopUpCommon (Gtk::Button* thisButton, const Glib::ustring& label) { button->set_relief (Gtk::RELIEF_NORMAL); button->set_border_width (0); button->add(*imageContainer); - if (!label.empty()) { + if (label.size()) { Gtk::Label* buttonLabel = Gtk::manage ( new Gtk::Label(label + " ") ); imageContainer->pack_start(*buttonLabel, Gtk::PACK_SHRINK, 0); } @@ -52,11 +52,11 @@ PopUpCommon::PopUpCommon (Gtk::Button* thisButton, const Glib::ustring& label) { } PopUpCommon::~PopUpCommon () { - for (std::vector::const_iterator i = images.begin(); i != images.end(); ++i) + for (std::vector::iterator i = images.begin(); i != images.end(); ++i) { delete *i; } - for (std::vector::const_iterator i = items.begin(); i != items.end(); ++i) + for (std::vector::iterator i = items.begin(); i != items.end(); ++i) { delete *i; } @@ -65,19 +65,19 @@ PopUpCommon::~PopUpCommon () { delete buttonGroup; } -PopUpCommon::type_signal_changed PopUpCommon::signal_changed() const { +PopUpCommon::type_signal_changed PopUpCommon::signal_changed() { return message; } bool PopUpCommon::addEntry (Glib::ustring fileName, Glib::ustring label) { bool added = false; - if (!label.empty()) { + if ( label.size() ) { imageFilenames.push_back(fileName); sItems.push_back(label); // Create the image RTImage* newImage = new RTImage(fileName); images.push_back(newImage); - size_t currPos = images.size(); + int currPos = (int)images.size(); // Create the menu item Gtk::ImageMenuItem* newItem = new Gtk::ImageMenuItem (*newImage, label); items.push_back(newItem); @@ -121,7 +121,7 @@ void PopUpCommon::entrySelected (int i) { * Set the button image with the selected item */ bool PopUpCommon::setSelected (int entryNum) { - if (entryNum < 0 || entryNum > (images.size()-1) || entryNum == selected) + if (entryNum < 0 || entryNum > ((int)images.size()-1) || (int)entryNum == selected) return false; else { // Maybe we could do something better than loading the image file each time the selection is changed !? diff --git a/rtgui/popupcommon.h b/rtgui/popupcommon.h index cd631b4fe..eba9e1ea3 100644 --- a/rtgui/popupcommon.h +++ b/rtgui/popupcommon.h @@ -31,14 +31,14 @@ class PopUpCommon { public: typedef sigc::signal type_signal_changed; - type_signal_changed signal_changed() const; + type_signal_changed signal_changed(); Gtk::HBox* buttonGroup; // this is the widget to be packed PopUpCommon (Gtk::Button* button, const Glib::ustring& label = ""); virtual ~PopUpCommon (); bool addEntry (Glib::ustring fileName, Glib::ustring label); bool setSelected (int entryNum); - int getSelected () const { return selected; } + int getSelected () { return selected; } void setButtonHint(); void show (); void set_tooltip_text (const Glib::ustring &text); diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 0b1896f36..9a01b676f 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -139,7 +139,7 @@ Gtk::Widget* Preferences::getBatchProcPanel () { behTreeView->get_column (2)->set_fixed_width (50); // fill model - Gtk::TreeModel::const_iterator mi, ci; + Gtk::TreeModel::iterator mi, ci; /* * The TRUE/FALSE values of appendBehavList are replaced by the one defined in options.cc, @@ -256,7 +256,7 @@ Gtk::Widget* Preferences::getBatchProcPanel () { void Preferences::appendBehavList (Gtk::TreeModel::iterator& parent, Glib::ustring label, int id, bool set) { - Gtk::TreeModel::const_iterator ci = behModel->append (parent->children()); + Gtk::TreeModel::iterator ci = behModel->append (parent->children()); ci->set_value (behavColumns.label, label); ci->set_value (behavColumns.visible, true); ci->set_value (behavColumns.badd, !set); @@ -266,7 +266,7 @@ void Preferences::appendBehavList (Gtk::TreeModel::iterator& parent, Glib::ustri void Preferences::behAddRadioToggled (const Glib::ustring& path) { - Gtk::TreeModel::const_iterator iter = behModel->get_iter (path); + Gtk::TreeModel::iterator iter = behModel->get_iter (path); //bool set = iter->get_value (behavColumns.bset); iter->set_value (behavColumns.bset, false); iter->set_value (behavColumns.badd, true); @@ -274,7 +274,7 @@ void Preferences::behAddRadioToggled (const Glib::ustring& path) { void Preferences::behSetRadioToggled (const Glib::ustring& path) { - Gtk::TreeModel::const_iterator iter = behModel->get_iter (path); + Gtk::TreeModel::iterator iter = behModel->get_iter (path); //bool add = iter->get_value (behavColumns.badd); iter->set_value (behavColumns.bset, true); iter->set_value (behavColumns.badd, false); @@ -1360,7 +1360,7 @@ void Preferences::switchThemeTo(Glib::ustring newTheme, bool slimInterface) { Gtk::RC::reparse_all (Gtk::Settings::get_default()); GdkEventClient event = { GDK_CLIENT_EVENT, NULL, TRUE, gdk_atom_intern("_GTK_READ_RCFILES", FALSE), 8 }; - gdk_event_send_clientmessage_toall (reinterpret_cast(&event)); + gdk_event_send_clientmessage_toall ((GdkEvent*)&event); } void Preferences::workflowUpdate (){ @@ -1402,7 +1402,7 @@ void Preferences::switchFontTo(Glib::ustring newFont) { "style \"clearlooks-default\" { font_name = \"%1\" }", newFont)); Gtk::RC::reparse_all (Gtk::Settings::get_default()); GdkEventClient event = { GDK_CLIENT_EVENT, NULL, TRUE, gdk_atom_intern("_GTK_READ_RCFILES", FALSE), 8 }; - gdk_event_send_clientmessage_toall (reinterpret_cast(&event)); + gdk_event_send_clientmessage_toall ((GdkEvent*)&event); } void Preferences::useThemeChanged(){ diff --git a/rtgui/previewhandler.cc b/rtgui/previewhandler.cc index 74a13828e..a7d2b2081 100644 --- a/rtgui/previewhandler.cc +++ b/rtgui/previewhandler.cc @@ -220,6 +220,6 @@ Glib::RefPtr PreviewHandler::getRoughImage (int desiredW, int desir void PreviewHandler::previewImageChanged () { - for (std::list::const_iterator i=listeners.begin(); i!=listeners.end(); ++i) + for (std::list::iterator i=listeners.begin(); i!=listeners.end(); i++) (*i)->previewImageChanged (); } diff --git a/rtgui/previewhandler.h b/rtgui/previewhandler.h index da50452fd..da7bcee88 100644 --- a/rtgui/previewhandler.h +++ b/rtgui/previewhandler.h @@ -70,7 +70,7 @@ class PreviewHandler : public rtengine::PreviewImageListener { // with this function it is possible to ask for a rough approximation of a (possibly zoomed) crop of the image Glib::RefPtr getRoughImage (int x, int y, int w, int h, double zoom); Glib::RefPtr getRoughImage (int desiredW, int desiredH, double& zoom); - rtengine::procparams::CropParams getCropParams () const { return cropParams; } + rtengine::procparams::CropParams getCropParams () { return cropParams; } }; #endif diff --git a/rtgui/previewloader.cc b/rtgui/previewloader.cc index e3e358c37..43976cbfd 100644 --- a/rtgui/previewloader.cc +++ b/rtgui/previewloader.cc @@ -52,7 +52,7 @@ public: struct JobCompare { - bool operator()(const Job& lhs, const Job& rhs) const + bool operator()(const Job& lhs, const Job& rhs) { if ( lhs.dir_id_ == rhs.dir_id_ ) { diff --git a/rtgui/profilepanel.cc b/rtgui/profilepanel.cc index 4b50bf135..cb06d0c24 100644 --- a/rtgui/profilepanel.cc +++ b/rtgui/profilepanel.cc @@ -107,7 +107,7 @@ void ProfilePanel::refreshProfileList () { // re-parse profile directories (deletes old ones) profileStore.parseProfiles (); pparams = profileStore.getProfileNames (); - for (size_t i=0; iappend_text (pparams[i]); if (custom) @@ -125,7 +125,7 @@ void ProfilePanel::save_clicked (GdkEventButton* event) { return; Gtk::FileChooserDialog dialog(M("PROFILEPANEL_SAVEDLGLABEL"), Gtk::FILE_CHOOSER_ACTION_SAVE); - if (!options.loadSaveProfilePath.empty()) + if (options.loadSaveProfilePath.length()) dialog.set_current_folder (options.loadSaveProfilePath); else if (options.multiUser) dialog.set_current_folder (Options::rtdir + "/" + options.profilePath); @@ -267,7 +267,7 @@ void ProfilePanel::load_clicked (GdkEventButton* event) { return; Gtk::FileChooserDialog dialog(M("PROFILEPANEL_LOADDLGLABEL"), Gtk::FILE_CHOOSER_ACTION_OPEN); - if (!options.loadSaveProfilePath.empty()) + if (options.loadSaveProfilePath.length()) dialog.set_current_folder (options.loadSaveProfilePath); else if (options.multiUser) dialog.set_current_folder (Options::rtdir + "/" + options.profilePath); @@ -442,7 +442,7 @@ void ProfilePanel::initProfile (const Glib::ustring& profname, ProcParams* lastS pparams.clear (); pparams = profileStore.getProfileNames (); - for (size_t i=0; iappend_text (pparams[i]); if (custom) { diff --git a/rtgui/profilestore.cc b/rtgui/profilestore.cc index b6bc22329..9516a88d5 100644 --- a/rtgui/profilestore.cc +++ b/rtgui/profilestore.cc @@ -29,7 +29,7 @@ using namespace rtengine::procparams; extern Glib::ustring argv0; ProfileStore::~ProfileStore () { - for (std::map::const_iterator i = partProfiles.begin(); i!=partProfiles.end(); ++i) { + for (std::map::iterator i = partProfiles.begin(); i!=partProfiles.end(); i++) { if (i->second->pparams) delete i->second->pparams; if (i->second->pedited) delete i->second->pedited; delete i->second; @@ -39,7 +39,7 @@ ProfileStore::~ProfileStore () { void ProfileStore::parseProfiles () { // clear loaded profiles - for (std::map::const_iterator i = partProfiles.begin(); i!=partProfiles.end(); ++i) { + for (std::map::iterator i = partProfiles.begin(); i!=partProfiles.end(); i++) { delete i->second->pparams; delete i->second->pedited; delete i->second; @@ -58,7 +58,7 @@ void ProfileStore::parseProfiles () { void ProfileStore::parseDir (const Glib::ustring& pdir) { // reload the available profiles from the profile dir - if (!pdir.empty()) { + if (pdir!="") { // process directory Glib::ustring dirname = pdir; Glib::Dir* dir = NULL; @@ -103,7 +103,7 @@ void ProfileStore::parseDir (const Glib::ustring& pdir) { PartialProfile* ProfileStore::getProfile (const Glib::ustring& profname) { - std::map::const_iterator prof = partProfiles.find(profname); + std::map::iterator prof = partProfiles.find(profname); if (prof != partProfiles.end()) return partProfiles[profname]; else @@ -113,7 +113,7 @@ PartialProfile* ProfileStore::getProfile (const Glib::ustring& profname) { std::vector ProfileStore::getProfileNames () { std::vector ret; - for (std::map::const_iterator i = partProfiles.begin(); i!=partProfiles.end(); ++i) + for (std::map::iterator i = partProfiles.begin(); i!=partProfiles.end(); i++) ret.push_back (i->first); return ret; } diff --git a/rtgui/progressconnector.h b/rtgui/progressconnector.h index d5f46ee75..791119aa2 100644 --- a/rtgui/progressconnector.h +++ b/rtgui/progressconnector.h @@ -67,7 +67,7 @@ class ProgressConnector { static int emitEndSignalUI (void* data) { - sigc::signal0* opEnd = static_cast*>(data); + sigc::signal0* opEnd = (sigc::signal0*) data; int r = opEnd->emit (); delete opEnd; @@ -92,7 +92,7 @@ class ProgressConnector { } } - T returnValue() const { + T returnValue(){ return retval; } }; diff --git a/rtgui/recentbrowser.cc b/rtgui/recentbrowser.cc index af49358fd..e8ee0afca 100644 --- a/rtgui/recentbrowser.cc +++ b/rtgui/recentbrowser.cc @@ -38,7 +38,7 @@ RecentBrowser::RecentBrowser () : listener (NULL) { void RecentBrowser::selectionChanged () { Glib::ustring sel = recentDirs->get_active_text (); - if (!sel.empty() && listener) + if (sel!="" && listener) listener->selectDir (sel); } diff --git a/rtgui/renamedlg.cc b/rtgui/renamedlg.cc index 34e94e174..a53883ea7 100644 --- a/rtgui/renamedlg.cc +++ b/rtgui/renamedlg.cc @@ -119,13 +119,13 @@ void RenameDialog::useTemplToggled () { bool RenameDialog::isTemplSelected () { - Gtk::TreeModel::const_iterator iter = templates->get_active(); + Gtk::TreeModel::iterator iter = templates->get_active(); return iter && iter->get_value (templateColumns.tmplName)!=M("FILEBROWSER_ADDDELTEMPLATE"); } Glib::ustring RenameDialog::getActiveTemplate () { - Gtk::TreeModel::const_iterator iter = templates->get_active(); + Gtk::TreeModel::iterator iter = templates->get_active(); if (iter && iter->get_value (templateColumns.tmplName)!=M("FILEBROWSER_ADDDELTEMPLATE")) return iter->get_value (templateColumns.tmplName); else @@ -134,7 +134,7 @@ Glib::ustring RenameDialog::getActiveTemplate () { void RenameDialog::tmplSelectionChanged () { - Gtk::TreeModel::const_iterator iter = templates->get_active(); + Gtk::TreeModel::iterator iter = templates->get_active(); if (iter && iter->get_value (templateColumns.tmplName)==M("FILEBROWSER_ADDDELTEMPLATE")) { RenameTemplateEditor* rte = new RenameTemplateEditor (p); if (rte->run()==Gtk::RESPONSE_OK) { @@ -188,7 +188,7 @@ void RenameTemplateEditor::refreshTemplateList () { void RenameTemplateEditor::addPressed () { - if (!templ->get_text().empty()) { + if (templ->get_text()!="") { options.renameTemplates.push_back (templ->get_text ()); refreshTemplateList (); templ->set_text(""); diff --git a/rtgui/rtimage.cc b/rtgui/rtimage.cc index 2a6585bbf..80bd00cb1 100644 --- a/rtgui/rtimage.cc +++ b/rtgui/rtimage.cc @@ -33,7 +33,7 @@ std::vector imagesList; // List of images in order to live upd */ RTImage::RTImage(Glib::ustring fileName, Glib::ustring rtlFileName) : Gtk::Image() { Glib::ustring path; - if (!rtlFileName.empty()) { + if (rtlFileName.length()) { const Gtk::TextDirection dir = get_direction(); if (dir == Gtk::TEXT_DIR_RTL) path = findIconAbsolutePath(rtlFileName); @@ -55,7 +55,7 @@ RTImage::~RTImage() { } void RTImage::updateImages() { - for (size_t i=0; iproperty_file(); Glib::ustring fileName = Glib::path_get_basename(oldPath); imagesList[i]->clear(); @@ -73,7 +73,7 @@ void RTImage::changeImage(Glib::ustring &newImage) { Glib::ustring RTImage::findIconAbsolutePath(const Glib::ustring &iconFName) { Glib::ustring path; - for (size_t i=0; iselectEditorPanel(name)) return true; } else { - std::map::const_iterator iep = epanels.find(name); + std::map::iterator iep = epanels.find(name); if (iep!=epanels.end()) { mainNB->set_current_page (mainNB->page_num (*iep->second)); diff --git a/rtgui/saveasdlg.cc b/rtgui/saveasdlg.cc index 180a5f412..df3bdaa89 100644 --- a/rtgui/saveasdlg.cc +++ b/rtgui/saveasdlg.cc @@ -126,7 +126,7 @@ bool SaveAsDialog::getToTailOfQueue () { Glib::ustring SaveAsDialog::getFileName () { // fname is empty if the dialog has been cancelled - if (!fname.empty()) + if (fname.length()) return removeExtension(fname) + Glib::ustring(".") + formatOpts->getFormat().format; else return ""; @@ -149,7 +149,7 @@ void SaveAsDialog::okPressed () { // checking if the filename field is empty. The user have to click Cancel if he don't want to specify a filename // NB: There seem to be a bug in Gtkmm2.22 / FileChooserWidget : if you suppress the filename entry and // click on a folder in the list, the filename field is empty but get_filename will return the folder's path :/ - if (fname.empty() || safe_file_test (fname, Glib::FILE_TEST_IS_DIR)) { + if (!fname.length() || safe_file_test (fname, Glib::FILE_TEST_IS_DIR)) { Glib::ustring msg_ = Glib::ustring("") + M("MAIN_MSG_EMPTYFILENAME") + ""; Gtk::MessageDialog msgd (*this, msg_, true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_OK, true); msgd.run (); diff --git a/rtgui/shcselector.h b/rtgui/shcselector.h index 467520325..17e177a64 100644 --- a/rtgui/shcselector.h +++ b/rtgui/shcselector.h @@ -45,7 +45,7 @@ class SHCSelector : public Gtk::DrawingArea { SHCSelector(); - void setSHCListener (SHCListener* l) { cl = l; } + void setSHCListener (SHCListener* l) { cl = l;; } void setPositions (double spos, double cpos, double hpos); void getPositions (double& spos, double& cpos, double& hpos); diff --git a/rtgui/thumbbrowserbase.cc b/rtgui/thumbbrowserbase.cc index 29434e4c0..5c36ce330 100644 --- a/rtgui/thumbbrowserbase.cc +++ b/rtgui/thumbbrowserbase.cc @@ -261,7 +261,7 @@ bool ThumbBrowserBase::Internal::on_query_tooltip (int x, int y, bool keyboard_t ttip = parent->fd[i]->getToolTip (x, y); break; } - if (!ttip.empty()) { + if (ttip!="") { tooltip->set_text (ttip); return true; } diff --git a/rtgui/thumbbrowserentry.cc b/rtgui/thumbbrowserentry.cc index 7c45f013f..7703e9775 100644 --- a/rtgui/thumbbrowserentry.cc +++ b/rtgui/thumbbrowserentry.cc @@ -54,5 +54,5 @@ std::vector > ThumbBrowserEntry::getIconsOnImageArea ( ThumbnailButtonSet* ThumbBrowserEntry::getThumbButtonSet () { - return static_cast(buttonSet); + return (ThumbnailButtonSet*)buttonSet; } diff --git a/rtgui/thumbbrowserentrybase.cc b/rtgui/thumbbrowserentrybase.cc index e59ef5e94..bbbd79a60 100644 --- a/rtgui/thumbbrowserentrybase.cc +++ b/rtgui/thumbbrowserentrybase.cc @@ -189,7 +189,7 @@ void ThumbBrowserEntryBase::updateBackBuffer () { // draw date/time label int tpos = fnlabh; - if (options.fbShowDateTime && !datetimeline.empty()) { + if (options.fbShowDateTime && datetimeline!="") { fn = w->create_pango_layout (datetimeline); fn->set_width (textw*Pango::SCALE); fn->set_ellipsize (Pango::ELLIPSIZE_MIDDLE); @@ -197,7 +197,7 @@ void ThumbBrowserEntryBase::updateBackBuffer () { tpos += dtlabh; } // draw basic exif info - if (options.fbShowBasicExif && !exifline.empty()) { + if (options.fbShowBasicExif && exifline!="") { fn = w->create_pango_layout (exifline); fn->set_width (textw*Pango::SCALE); fn->set_ellipsize (Pango::ELLIPSIZE_MIDDLE); @@ -397,12 +397,12 @@ void ThumbBrowserEntryBase::setOffset (int x, int y) { buttonSet->move (ofsX+startx+sideMargin, ofsY+starty+upperMargin); } -bool ThumbBrowserEntryBase::inside (int x, int y) const { +bool ThumbBrowserEntryBase::inside (int x, int y) { return x>ofsX+startx && xofsY+starty && yx+w || ofsX+startx+exp_widthy+h || ofsY+starty+exp_heightprocParamsChanged (this, whoClearedIt); } -bool Thumbnail::hasProcParams () const { +bool Thumbnail::hasProcParams () { return pparamsValid; } @@ -355,7 +355,7 @@ void Thumbnail::setProcParams (const ProcParams& pp, ParamsEdited* pe, int whoCh listeners[i]->procParamsChanged (this, whoChangedIt); } -bool Thumbnail::isRecentlySaved () const { +bool Thumbnail::isRecentlySaved () { return cfs.recentlySaved; } @@ -377,7 +377,7 @@ void Thumbnail::imageRemovedFromQueue () { enqueueNumber--; } -bool Thumbnail::isEnqueued () const { +bool Thumbnail::isEnqueued () { return enqueueNumber > 0; } @@ -511,7 +511,7 @@ void Thumbnail::generateExifDateTimeStrings () { exifString = Glib::ustring::compose ("f/%1 %2s %3%4 %5mm", Glib::ustring(rtengine::ImageData::apertureToString(cfs.fnumber)), Glib::ustring(rtengine::ImageData::shutterToString(cfs.shutter)), M("QINFO_ISO"), cfs.iso, cfs.focalLen); - if (options.fbShowExpComp && cfs.expcomp!="0.00" && !cfs.expcomp.empty()) // don't show exposure compensation if it is 0.00EV;old cache iles do not have ExpComp, so value will not be displayed. + if (options.fbShowExpComp && cfs.expcomp!="0.00" && cfs.expcomp!="") // don't show exposure compensation if it is 0.00EV;old cache iles do not have ExpComp, so value will not be displayed. exifString = Glib::ustring::compose ("%1 %2EV", exifString, cfs.expcomp); // append exposure compensation to exifString std::string dateFormat = options.dateFormat; @@ -544,17 +544,17 @@ void Thumbnail::generateExifDateTimeStrings () { dateTimeString = ostr.str (); } -const Glib::ustring& Thumbnail::getExifString () const { +const Glib::ustring& Thumbnail::getExifString () { return exifString; } -const Glib::ustring& Thumbnail::getDateTimeString () const { +const Glib::ustring& Thumbnail::getDateTimeString () { return dateTimeString; } -ThFileType Thumbnail::getType () const { +ThFileType Thumbnail::getType () { return (ThFileType) cfs.format; } diff --git a/rtgui/thumbnail.h b/rtgui/thumbnail.h index 5a7d4bccc..63c3422a6 100644 --- a/rtgui/thumbnail.h +++ b/rtgui/thumbnail.h @@ -80,7 +80,7 @@ class Thumbnail { Thumbnail (CacheManager* cm, const Glib::ustring& fname, const std::string& md5); ~Thumbnail (); - bool hasProcParams () const ; + bool hasProcParams (); const rtengine::procparams::ProcParams& getProcParams (); // Use this to create params on demand for update @@ -92,13 +92,13 @@ class Thumbnail { void notifylisterners_procParamsChanged(int whoChangedIt); - bool isQuick() const { return cfs.thumbImgType == CacheImageData::QUICK_THUMBNAIL; } - bool isPParamsValid() const { return pparamsValid; } - bool isRecentlySaved () const; + bool isQuick() { return cfs.thumbImgType == CacheImageData::QUICK_THUMBNAIL; } + bool isPParamsValid() { return pparamsValid; } + bool isRecentlySaved (); void imageDeveloped (); void imageEnqueued (); void imageRemovedFromQueue (); - bool isEnqueued () const; + bool isEnqueued (); // unsigned char* getThumbnailImage (int &w, int &h, int fixwh=1); // fixwh = 0: fix w and calculate h, =1: fix h and calculate w rtengine::IImage8* processThumbImage (const rtengine::procparams::ProcParams& pparams, int h, double& scale); @@ -106,29 +106,29 @@ class Thumbnail { void getThumbnailSize (int &w, int &h); void getFinalSize (const rtengine::procparams::ProcParams& pparams, int& w, int& h); - const Glib::ustring& getExifString () const; - const Glib::ustring& getDateTimeString () const; + const Glib::ustring& getExifString (); + const Glib::ustring& getDateTimeString (); void getCamWB (double& temp, double& green) { if (tpp) tpp->getCamWB (temp, green); } void getAutoWB (double& temp, double& green) { if (tpp) tpp->getAutoWB (temp, green); } void getSpotWB (int x, int y, int rect, double& temp, double& green) { if (tpp) tpp->getSpotWB (getProcParams(), x, y, rect, temp, green); } void applyAutoExp (rtengine::procparams::ProcParams& pparams) { if (tpp) tpp->applyAutoExp (pparams); } - ThFileType getType () const; - Glib::ustring getFileName () const { return fname; } + ThFileType getType (); + Glib::ustring getFileName () { return fname; } void setFileName (const Glib::ustring fn); - bool isSupported () const; + bool isSupported (); - const CacheImageData* getCacheImageData() const { return &cfs; } - std::string getMD5 () const { return cfs.md5; } + const CacheImageData* getCacheImageData() { return &cfs; } + std::string getMD5 () { return cfs.md5; } - int getRank () const { return pparams.rank; } + int getRank () { return pparams.rank; } void setRank (int rank) { if (pparams.rank != rank) { pparams.rank = rank; pparamsValid = true; } } - int getColorLabel () const { return pparams.colorlabel; } + int getColorLabel () { return pparams.colorlabel; } void setColorLabel (int colorlabel) { if (pparams.colorlabel != colorlabel) { pparams.colorlabel = colorlabel; pparamsValid = true; } } - int getStage () const { return pparams.inTrash; } + int getStage () { return pparams.inTrash; } void setStage (int stage) { if (pparams.inTrash != stage) { pparams.inTrash = stage; pparamsValid = true; } } void addThumbnailListener (ThumbnailListener* tnl); diff --git a/rtgui/toolbar.cc b/rtgui/toolbar.cc index e8fcae5ae..99835e2ef 100644 --- a/rtgui/toolbar.cc +++ b/rtgui/toolbar.cc @@ -92,7 +92,7 @@ void ToolBar::setTool (ToolMode tool) { if (tool==TMHand){ handTool->set_active (true); - handTool->grab_focus(); // switch focus to the handTool button + handTool->grab_focus();; // switch focus to the handTool button } else if (tool==TMSpotWB) wbTool->set_active (true); diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc index 058e1e3d4..7540316a1 100644 --- a/rtgui/toolpanelcoord.cc +++ b/rtgui/toolpanelcoord.cc @@ -304,12 +304,12 @@ void ToolPanelCoordinator::profileChange (const PartialProfile *nparams, rtengi if (params->coarse.rotate==270) tr |= TR_R270; // trimming overflowing cropped area - rtengine::ImageSource *ii = static_cast(ipc->getInitialImage()); + rtengine::ImageSource *ii = (rtengine::ImageSource*)ipc->getInitialImage(); ii->getFullSize (fw, fh, tr); crop->trim(params, fw, fh); // updating the GUI with updated values - for (size_t i=0; iread (params); // start the IPC processing @@ -353,7 +353,7 @@ void ToolPanelCoordinator::initImage (rtengine::StagedImageProcessor* ipc_, bool ipc->setSizeListener (resize); } - icm->setRawMeta (raw, static_cast(pMetaData)); + icm->setRawMeta (raw, (const rtengine::ImageData*)pMetaData); hlrecovery->setRaw (raw); hasChanged = true; } diff --git a/rtgui/toolpanelcoord.h b/rtgui/toolpanelcoord.h index 94cf0c34a..7d51128e5 100644 --- a/rtgui/toolpanelcoord.h +++ b/rtgui/toolpanelcoord.h @@ -174,7 +174,7 @@ class ToolPanelCoordinator : public ToolPanelListener, ToolPanelCoordinator (); virtual ~ToolPanelCoordinator (); - bool getChangedState () const { return hasChanged; } + bool getChangedState () { return hasChanged; } void updateCurveBackgroundHistogram (LUTu & histToneCurve, LUTu & histLCurve, LUTu & histRed, LUTu & histGreen, LUTu & histBlue, LUTu & histLuma); void foldAllButOne (Gtk::Box* parent, FoldableToolPanel* openedSection); diff --git a/rtgui/whitebalance.cc b/rtgui/whitebalance.cc index a9ca74271..55207c47c 100644 --- a/rtgui/whitebalance.cc +++ b/rtgui/whitebalance.cc @@ -77,7 +77,7 @@ WhiteBalance::WhiteBalance () : Gtk::VBox(), FoldableToolPanel(this), wbp(NULL), enum WBTypes oldType = WBParams::wbEntries[0]->type; enum WBTypes currType; Gtk::TreeModel::Row row, childrow; - for (size_t i=0; itype)) { // New entry type if (currType == WBT_FLUORESCENT) { @@ -529,7 +529,7 @@ void WhiteBalance::cache_customWB(int temp, double green) { } int WhiteBalance::findWBEntryId (Glib::ustring label, enum WB_LabelType lblType) { - for (size_t i=0; iGUILabel : WBParams::wbEntries[i]->ppLabel)) return i; } @@ -537,7 +537,7 @@ int WhiteBalance::findWBEntryId (Glib::ustring label, enum WB_LabelType lblType) } WBEntry* WhiteBalance::findWBEntry (Glib::ustring label, enum WB_LabelType lblType) { - for (size_t i=0; iGUILabel : WBParams::wbEntries[i]->ppLabel)) return WBParams::wbEntries[i]; } @@ -546,7 +546,7 @@ WBEntry* WhiteBalance::findWBEntry (Glib::ustring label, enum WB_LabelType lblTy int WhiteBalance::_setActiveMethod(Glib::ustring &label, Gtk::TreeModel::Children &children) { int found = -1; - for(Gtk::TreeModel::Children::const_iterator iter = children.begin(); iter != children.end() && found==-1; ++iter) { + for(Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end() && found==-1; ++iter) { Gtk::TreeModel::Row row = *iter; if (row[methodColumns.colLabel] == label) { method->set_active(iter); @@ -556,7 +556,7 @@ int WhiteBalance::_setActiveMethod(Glib::ustring &label, Gtk::TreeModel::Childre return found; Gtk::TreeModel::Children childs = row.children(); - if (!childs.empty()) { + if (childs.size()) { found = _setActiveMethod(label, childs); if (found !=-1) return found; diff --git a/rtgui/windirmonitor.cc b/rtgui/windirmonitor.cc index 970463921..66dbefd3b 100644 --- a/rtgui/windirmonitor.cc +++ b/rtgui/windirmonitor.cc @@ -23,7 +23,7 @@ static void CALLBACK current_directory_monitor_callback (DWORD error, DWORD nByt DWORD dwOffset = 0; FILE_NOTIFY_INFORMATION* pInfo = NULL; - WinDirMonitor::MonitorData* monData = reinterpret_cast(lpOverlapped); + WinDirMonitor::MonitorData* monData = (WinDirMonitor::MonitorData*)lpOverlapped; if (!nBytes) { delete monData; return; @@ -33,7 +33,7 @@ static void CALLBACK current_directory_monitor_callback (DWORD error, DWORD nByt // Analysis of the modifications. Let only parsed file extensions emit a notify, not PP3 changes do { // Get a pointer to the first change record... - pInfo = reinterpret_cast(&monData->file_notify_buffer[dwOffset]); + pInfo = (FILE_NOTIFY_INFORMATION*) &monData->file_notify_buffer[dwOffset]; char fnameC[(MAX_PATH+1)*2] = {0}; int strLen = WideCharToMultiByte(CP_UTF8,0,pInfo->FileName,pInfo->FileNameLength/sizeof(WCHAR),fnameC,sizeof(fnameC),0,0);