[QGIS Commit] r9594 - in trunk/qgis/src: core/raster gui plugins/interpolation

[svn_qgis at osgeo.org]

Author: jef
Date: 2008-11-08 09:57:25 -0500 (Sat, 08 Nov 2008)
New Revision: 9594

Modified:
   trunk/qgis/src/core/raster/qgsrasterlayer.cpp
   trunk/qgis/src/core/raster/qgsrasterlayer.h
   trunk/qgis/src/gui/qgsquickprint.cpp
   trunk/qgis/src/plugins/interpolation/DualEdgeTriangulation.cc
Log:
fix warnings

Modified: trunk/qgis/src/core/raster/qgsrasterlayer.cpp
===================================================================
--- trunk/qgis/src/core/raster/qgsrasterlayer.cpp	2008-11-08 11:56:28 UTC (rev 9593)
+++ trunk/qgis/src/core/raster/qgsrasterlayer.cpp	2008-11-08 14:57:25 UTC (rev 9594)
@@ -1228,7 +1228,7 @@
  */
 QgsContrastEnhancement* QgsRasterLayer::contrastEnhancement( unsigned int theBand )
 {
-  if ( 0 < theBand && theBand <= ( int ) bandCount() )
+  if ( 0 < theBand && theBand <= bandCount() )
   {
      return &mContrastEnhancementList[theBand - 1];
   }

Modified: trunk/qgis/src/core/raster/qgsrasterlayer.h
===================================================================
--- trunk/qgis/src/core/raster/qgsrasterlayer.h	2008-11-08 11:56:28 UTC (rev 9593)
+++ trunk/qgis/src/core/raster/qgsrasterlayer.h	2008-11-08 14:57:25 UTC (rev 9594)
@@ -771,6 +771,9 @@
     /** \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 @@
     /** \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 @@
     /** \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 @@
 
     /** \brief Flag indicating if the nodatavalue is valid*/
     bool mValidNoDataValue;
-
-    /** \brief  Raster width */
-    int mWidth;
 };
 
 #endif

Modified: trunk/qgis/src/gui/qgsquickprint.cpp
===================================================================
--- trunk/qgis/src/gui/qgsquickprint.cpp	2008-11-08 11:56:28 UTC (rev 9593)
+++ trunk/qgis/src/gui/qgsquickprint.cpp	2008-11-08 14:57:25 UTC (rev 9594)
@@ -229,7 +229,6 @@
   //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;

Modified: trunk/qgis/src/plugins/interpolation/DualEdgeTriangulation.cc
===================================================================
--- trunk/qgis/src/plugins/interpolation/DualEdgeTriangulation.cc	2008-11-08 11:56:28 UTC (rev 9593)
+++ trunk/qgis/src/plugins/interpolation/DualEdgeTriangulation.cc	2008-11-08 14:57:25 UTC (rev 9594)
@@ -473,7 +473,7 @@
   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 )
   {