Skip to content

Commit

Permalink
fix warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jul 31, 2012
1 parent 46d40c4 commit c859799
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/core/raster/qgsrasterlayer.cpp
Expand Up @@ -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;
Expand Down
10 changes: 6 additions & 4 deletions src/gui/raster/qgsrasterhistogramwidget.cpp
Expand Up @@ -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( );
Expand Down

0 comments on commit c859799

Please sign in to comment.