Skip to content
Permalink
Browse files
fix warnings
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9594 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Nov 8, 2008
1 parent 1e2bd5f commit e800766f9d1726e5cc1344f51a5e11a605dc2d96
Showing with 8 additions and 9 deletions.
  1. +1 −1 src/core/raster/qgsrasterlayer.cpp
  2. +6 −6 src/core/raster/qgsrasterlayer.h
  3. +0 −1 src/gui/qgsquickprint.cpp
  4. +1 −1 src/plugins/interpolation/DualEdgeTriangulation.cc
@@ -1228,7 +1228,7 @@ void QgsRasterLayer::computeMinimumMaximumEstimates( QString theBand, double* th
*/
QgsContrastEnhancement* QgsRasterLayer::contrastEnhancement( unsigned int theBand )
{
if ( 0 < theBand && theBand <= ( int ) bandCount() )
if ( 0 < theBand && theBand <= bandCount() )
{
return &mContrastEnhancementList[theBand - 1];
}
@@ -771,6 +771,9 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
/** \brief List containing the contrast enhancements for each band */
ContrastEnhancementList mContrastEnhancementList;

/** \brief Number of stddev to plot (0) to ignore. Not applicable to all layer types */
double mStandardDeviations;

/** [ data provider interface ] Pointer to data provider derived from the abstract base class QgsDataProvider */
QgsRasterDataProvider* mDataProvider;

@@ -806,6 +809,9 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
/** \brief Whether this raster has overviews / pyramids or not */
bool mHasPyramids;

/** \brief Raster width */
int mWidth;

/** \brief Raster height */
int mHeight;

@@ -847,9 +853,6 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
/** \brief Flag to indicate of the min max values are actual or estimates/user defined */
bool mRGBMinimumMaximumEstimated;

/** \brief Number of stddev to plot (0) to ignore. Not applicable to all layer types */
double mStandardDeviations;

/** \brief The band to be associated with transparency */
QString mTransparencyBandName;

@@ -861,9 +864,6 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer

/** \brief Flag indicating if the nodatavalue is valid*/
bool mValidNoDataValue;

/** \brief Raster width */
int mWidth;
};

#endif
@@ -229,7 +229,6 @@ void QgsQuickPrint::printMap()
//sensible default to prevent divide by zero
if ( 0 == myOriginalDpi ) myOriginalDpi = 96;
QSize myOriginalSize = mpMapRenderer->outputSize();
int mySymbolScalingAmount = myPrintResolutionDpi / myOriginalDpi;

//define the font sizes and family
int myMapTitleFontSize = 24;
@@ -473,7 +473,7 @@ int DualEdgeTriangulation::baseEdgeOfTriangle( Point3D* point )
int nulls = 0;//number of left-of-tests, which returned 0. 1 means, that the point is on a line, 2 means that it is on an existing point
int numinstabs = 0;//number of suspect left-of-tests due to 'leftOfTresh'
int runs = 0;//counter for the number of iterations in the loop to prevent an endless loop
int firstendp, secendp, thendp, fouendp;//four numbers of endpoints in cases when two left-of-test are 0
int firstendp = 0, secendp = 0, thendp = 0, fouendp = 0; //four numbers of endpoints in cases when two left-of-test are 0

while ( true )
{

0 comments on commit e800766

Please sign in to comment.