fix warnings

qgis · Jul 31, 2012 · c859799 · c859799
1 parent 46d40c4
commit c859799
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -2697,7 +2697,7 @@ QString QgsRasterLayer::validateBandName( QString const & theBandName )
   for ( int myIterator = 1; myIterator < mDataProvider->bandCount(); ++myIterator )
   {
     //find out the name of this band
-    if ( mDataProvider->generateBandName( myIterator ) == theBandName );
+    if ( mDataProvider->generateBandName( myIterator ) == theBandName )
     {
       QgsDebugMsg( "Matching band name found" );
       return theBandName;

diff --git a/src/gui/raster/qgsrasterhistogramwidget.cpp b/src/gui/raster/qgsrasterhistogramwidget.cpp
@@ -738,17 +738,19 @@ void QgsRasterHistogramWidget::histoAction( const QString actionName, bool actio
       {
         leHistoMin->clear();
         leHistoMax->clear();
+#if 0
         // TODO - fix gdal provider: changes data type when nodata value is not found
         // this prevents us from getting proper min and max values here
-        // minMaxValues[0] = QgsContrastEnhancement::minimumValuePossible( ( QgsContrastEnhancement::QgsRasterDataType )
-        //                                                                 mRasterLayer->dataProvider()->dataType( theBandNo ) );
-        // minMaxValues[1] = QgsContrastEnhancement::maximumValuePossible( ( QgsContrastEnhancement::QgsRasterDataType )
-        //                                                                 mRasterLayer->dataProvider()->dataType( theBandNo ) );
+        minMaxValues[0] = QgsContrastEnhancement::minimumValuePossible(
+                            ( QgsContrastEnhancement::QgsRasterDataType ) mRasterLayer->dataProvider()->dataType( theBandNo ) );
+        minMaxValues[1] = QgsContrastEnhancement::maximumValuePossible(
+                            ( QgsContrastEnhancement::QgsRasterDataType ) mRasterLayer->dataProvider()->dataType( theBandNo ) );
       }
       else
       {
         leHistoMin->setText( QString::number( minMaxValues[0] ) );
         leHistoMax->setText( QString::number( minMaxValues[1] ) );
+#endif
       }
       applyHistoMin( );
       applyHistoMax( );