Skip to content

Commit c859799

Browse files
committed
fix warnings
1 parent 46d40c4 commit c859799

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/core/raster/qgsrasterlayer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2697,7 +2697,7 @@ QString QgsRasterLayer::validateBandName( QString const & theBandName )
26972697
for ( int myIterator = 1; myIterator < mDataProvider->bandCount(); ++myIterator )
26982698
{
26992699
//find out the name of this band
2700-
if ( mDataProvider->generateBandName( myIterator ) == theBandName );
2700+
if ( mDataProvider->generateBandName( myIterator ) == theBandName )
27012701
{
27022702
QgsDebugMsg( "Matching band name found" );
27032703
return theBandName;

src/gui/raster/qgsrasterhistogramwidget.cpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -738,17 +738,19 @@ void QgsRasterHistogramWidget::histoAction( const QString actionName, bool actio
738738
{
739739
leHistoMin->clear();
740740
leHistoMax->clear();
741+
#if 0
741742
// TODO - fix gdal provider: changes data type when nodata value is not found
742743
// this prevents us from getting proper min and max values here
743-
// minMaxValues[0] = QgsContrastEnhancement::minimumValuePossible( ( QgsContrastEnhancement::QgsRasterDataType )
744-
// mRasterLayer->dataProvider()->dataType( theBandNo ) );
745-
// minMaxValues[1] = QgsContrastEnhancement::maximumValuePossible( ( QgsContrastEnhancement::QgsRasterDataType )
746-
// mRasterLayer->dataProvider()->dataType( theBandNo ) );
744+
minMaxValues[0] = QgsContrastEnhancement::minimumValuePossible(
745+
( QgsContrastEnhancement::QgsRasterDataType ) mRasterLayer->dataProvider()->dataType( theBandNo ) );
746+
minMaxValues[1] = QgsContrastEnhancement::maximumValuePossible(
747+
( QgsContrastEnhancement::QgsRasterDataType ) mRasterLayer->dataProvider()->dataType( theBandNo ) );
747748
}
748749
else
749750
{
750751
leHistoMin->setText( QString::number( minMaxValues[0] ) );
751752
leHistoMax->setText( QString::number( minMaxValues[1] ) );
753+
#endif
752754
}
753755
applyHistoMin( );
754756
applyHistoMax( );

0 commit comments

Comments
 (0)