sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-11 00:04:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix gcc 4.3 warnings, a gcc 4.3 compile error and a MSVC warning

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@8666 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2008-06-21 15:35:32 +00:00
parent 5e58eb576b
commit 41f62a8e3a
9 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
python/core/conversions.sip
View File

@ -326,12 +326,18 @@ template<TYPE>
Py_DECREF(d); Py_DECREF(d);
if (kobj) if (kobj)
{
Py_DECREF(kobj); Py_DECREF(kobj);
}
if (tobj) if (tobj)
{
Py_DECREF(tobj); Py_DECREF(tobj);
}
else else
{
delete t; delete t;
}
return NULL; return NULL;
} }
@ -547,18 +553,24 @@ template<double, TYPE2>
PyObject *lst = PyList_New(0); PyObject *lst = PyList_New(0);
PyDict_SetItem(d, t1obj, lst); PyDict_SetItem(d, t1obj, lst);
if (lst) if (lst)
{
Py_DECREF(lst); Py_DECREF(lst);
} }
}
if (t1obj == NULL || t2obj == NULL || if (t1obj == NULL || t2obj == NULL ||
PyList_Append(PyDict_GetItem(d, t1obj), t2obj) < 0) PyList_Append(PyDict_GetItem(d, t1obj), t2obj) < 0)
{ {
Py_DECREF(d); Py_DECREF(d);
if (t1obj) if (t1obj)
{
Py_DECREF(t1obj); Py_DECREF(t1obj);
}
if (t2obj) if (t2obj)
{
Py_DECREF(t2obj); Py_DECREF(t2obj);
}
return NULL; return NULL;
} }

7
python/core/qgsmaplayerregistry.sip
View File

@ -14,10 +14,9 @@ public:
//! Returns the instance pointer, creating the object on the first call //! Returns the instance pointer, creating the object on the first call
static QgsMapLayerRegistry * instance(); static QgsMapLayerRegistry * instance();
/*! Return the number of registered layers.
* //! Return the number of registered layers.
* */ int count();
const int count();
~QgsMapLayerRegistry(); ~QgsMapLayerRegistry();

12
python/core/qgsrasterlayer.sip
View File

@ -114,10 +114,10 @@ public:
// Accessors for image height and width // Accessors for image height and width
// //
/** \brief Accessor that returns the width of the (unclipped) raster */ /** \brief Accessor that returns the width of the (unclipped) raster */
const int getRasterXDim(); int getRasterXDim();
/** \brief Accessor that returns the height of the (unclipped) raster */ /** \brief Accessor that returns the height of the (unclipped) raster */
const int getRasterYDim(); int getRasterYDim();
// //
// Accessor and mutator for no data double // Accessor and mutator for no data double
@ -126,7 +126,7 @@ public:
bool isNoDataValueValid(); bool isNoDataValueValid();
/** \brief Accessor that returns the NO_DATA entry for this raster. */ /** \brief Accessor that returns the NO_DATA entry for this raster. */
const double getNoDataValue(bool* isValid=0); double getNoDataValue(bool* isValid=0);
/** \brief Mutator that allows the NO_DATA entry for this raster to be overridden. */ /** \brief Mutator that allows the NO_DATA entry for this raster to be overridden. */
void setNoDataValue(double theNoData); void setNoDataValue(double theNoData);
@ -152,11 +152,11 @@ public:
void setStdDevsToPlot(double the); void setStdDevsToPlot(double the);
/** \brief Get the number of bands in this layer */ /** \brief Get the number of bands in this layer */
const unsigned int getBandCount(); unsigned int getBandCount();
/** \brief Get RasterBandStats for a band given its number (read only) */ /** \brief Get RasterBandStats for a band given its number (read only) */
const QgsRasterBandStats getRasterBandStats(int); const QgsRasterBandStats getRasterBandStats(int);
/** \brief Check whether a given band number has stats associated with it */ /** \brief Check whether a given band number has stats associated with it */
const bool hasStats(int theBandNoInt); bool hasStats(int theBandNoInt);
/** \brief Overloaded method that also returns stats for a band, but uses the band colour name /** \brief Overloaded method that also returns stats for a band, but uses the band colour name
* Note this approach is not recommeneded because it is possible for two gdal raster * Note this approach is not recommeneded because it is possible for two gdal raster
* bands to have the same name! * bands to have the same name!
@ -165,7 +165,7 @@ public:
/** \brief Get the number of a band given its name. Note this will be the rewritten name set /** \brief Get the number of a band given its name. Note this will be the rewritten name set
* up in the constructor, and will not necessarily be the same as the name retrieved directly from gdal! * up in the constructor, and will not necessarily be the same as the name retrieved directly from gdal!
* If no matching band is found zero will be returned! */ * If no matching band is found zero will be returned! */
const int getRasterBandNumber (const QString & theBandNameQString); int getRasterBandNumber (const QString & theBandNameQString);
/** \brief Get the name of a band given its number. */ /** \brief Get the name of a band given its number. */
const QString getRasterBandName(int theBandNoInt); const QString getRasterBandName(int theBandNoInt);
/** \brief Find out whether a given band exists. */ /** \brief Find out whether a given band exists. */

2
src/app/qgsrasterlayerproperties.cpp
View File

@ -1560,7 +1560,7 @@ void QgsRasterLayerProperties::on_buttonBuildPyramids_clicked()
// as true so that we can generate pyramids for them. // as true so that we can generate pyramids for them.
// //
QgsRasterLayer::RasterPyramidList myPyramidList = mRasterLayer->buildRasterPyramidList(); QgsRasterLayer::RasterPyramidList myPyramidList = mRasterLayer->buildRasterPyramidList();
for ( unsigned int myCounterInt = 0; myCounterInt < lbxPyramidResolutions->count(); myCounterInt++ ) for ( int myCounterInt = 0; myCounterInt < lbxPyramidResolutions->count(); myCounterInt++ )
{ {
QListWidgetItem *myItem = lbxPyramidResolutions->item( myCounterInt ); QListWidgetItem *myItem = lbxPyramidResolutions->item( myCounterInt );
if ( myItem->isSelected() ) if ( myItem->isSelected() )

2
src/core/qgsmaplayerregistry.cpp
View File

@ -53,7 +53,7 @@ QgsMapLayerRegistry::~QgsMapLayerRegistry()
} }
// get the layer count (number of registered layers) // get the layer count (number of registered layers)
const int QgsMapLayerRegistry::count() int QgsMapLayerRegistry::count()
{ {
return mMapLayers.size(); return mMapLayers.size();
} }

2
src/core/qgsmaplayerregistry.h
View File

@ -44,7 +44,7 @@ public:
/*! Return the number of registered layers. /*! Return the number of registered layers.
* *
* */ * */
const int count(); int count();
~QgsMapLayerRegistry(); ~QgsMapLayerRegistry();

6
src/core/raster/qgsrasterlayer.cpp
View File

@ -2238,7 +2238,7 @@ const QgsRasterBandStats QgsRasterLayer::getRasterBandStats(QString const & theB
//note this should be the rewritten name set up in the constructor, //note this should be the rewritten name set up in the constructor,
//not the name retrieved directly from gdal! //not the name retrieved directly from gdal!
//if no matching band is found zero will be returned! //if no matching band is found zero will be returned!
const int QgsRasterLayer::getRasterBandNumber(QString const & theBandNameQString) int QgsRasterLayer::getRasterBandNumber(QString const & theBandNameQString)
{ {
for (int myIterator = 0; myIterator < mRasterStatsList.size(); ++myIterator) for (int myIterator = 0; myIterator < mRasterStatsList.size(); ++myIterator)
{ {
@ -2280,7 +2280,7 @@ const QString QgsRasterLayer::getRasterBandName(int theBandNo)
/** Check whether a given band number has stats associated with it */ /** Check whether a given band number has stats associated with it */
const bool QgsRasterLayer::hasStats(int theBandNo) bool QgsRasterLayer::hasStats(int theBandNo)
{ {
if (theBandNo <= mRasterStatsList.size()) if (theBandNo <= mRasterStatsList.size())
{ {
@ -5110,7 +5110,7 @@ const QgsRasterDataProvider* QgsRasterLayer::getDataProvider() const
return mDataProvider; return mDataProvider;
} }
const unsigned int QgsRasterLayer::getBandCount() unsigned int QgsRasterLayer::getBandCount()
{ {
return mRasterStatsList.size(); return mRasterStatsList.size();
} }

12
src/core/raster/qgsrasterlayer.h
View File

@ -284,10 +284,10 @@ public:
// Accessors for image height and width // Accessors for image height and width
// //
/** \brief Accessor that returns the width of the (unclipped) raster */ /** \brief Accessor that returns the width of the (unclipped) raster */
const int getRasterXDim() {return mRasterXDim;} int getRasterXDim() {return mRasterXDim;}
/** \brief Accessor that returns the height of the (unclipped) raster */ /** \brief Accessor that returns the height of the (unclipped) raster */
const int getRasterYDim() {return mRasterYDim;} int getRasterYDim() {return mRasterYDim;}
// //
// Accessor and mutator for no data double // Accessor and mutator for no data double
@ -296,7 +296,7 @@ public:
bool isNoDataValueValid() {return mValidNoDataValue;} bool isNoDataValueValid() {return mValidNoDataValue;}
/** \brief Accessor that returns the NO_DATA entry for this raster. */ /** \brief Accessor that returns the NO_DATA entry for this raster. */
const double getNoDataValue(bool* isValid=0) { if(isValid) { *isValid = mValidNoDataValue;} return mNoDataValue;} double getNoDataValue(bool* isValid=0) { if(isValid) { *isValid = mValidNoDataValue;} return mNoDataValue;}
/** \brief Mutator that allows the NO_DATA entry for this raster to be overridden. */ /** \brief Mutator that allows the NO_DATA entry for this raster to be overridden. */
void setNoDataValue(double theNoData); void setNoDataValue(double theNoData);
@ -349,11 +349,11 @@ public:
mStandardDeviations = theStdDevsToPlot; mStandardDeviations = theStdDevsToPlot;
} }
/** \brief Get the number of bands in this layer */ /** \brief Get the number of bands in this layer */
const unsigned int getBandCount(); unsigned int getBandCount();
/** \brief Get RasterBandStats for a band given its number (read only) */ /** \brief Get RasterBandStats for a band given its number (read only) */
const QgsRasterBandStats getRasterBandStats(int); const QgsRasterBandStats getRasterBandStats(int);
/** \brief Check whether a given band number has stats associated with it */ /** \brief Check whether a given band number has stats associated with it */
const bool hasStats(int theBandNoInt); bool hasStats(int theBandNoInt);
/** \brief Overloaded method that also returns stats for a band, but uses the band colour name /** \brief Overloaded method that also returns stats for a band, but uses the band colour name
* Note this approach is not recommeneded because it is possible for two gdal raster * Note this approach is not recommeneded because it is possible for two gdal raster
* bands to have the same name! * bands to have the same name!
@ -362,7 +362,7 @@ public:
/** \brief Get the number of a band given its name. Note this will be the rewritten name set /** \brief Get the number of a band given its name. Note this will be the rewritten name set
* up in the constructor, and will not necessarily be the same as the name retrieved directly from gdal! * up in the constructor, and will not necessarily be the same as the name retrieved directly from gdal!
* If no matching band is found zero will be returned! */ * If no matching band is found zero will be returned! */
const int getRasterBandNumber (const QString & theBandNameQString); int getRasterBandNumber (const QString & theBandNameQString);
/** \brief Get the name of a band given its number. */ /** \brief Get the name of a band given its number. */
const QString getRasterBandName(int theBandNoInt); const QString getRasterBandName(int theBandNoInt);
/** \brief Find out whether a given band exists. */ /** \brief Find out whether a given band exists. */

2
src/providers/postgres/qgspostgresextentthread.cpp
View File

@ -18,6 +18,8 @@
/* $Id$ */ /* $Id$ */
#include <fstream> #include <fstream>
#include <cstdlib>
#include <QEvent> #include <QEvent>
#include <QApplication> #include <QApplication>
#include <QEvent> #include <QEvent>