Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix a crash when un-setting raster band in raster layer properties
  • Loading branch information
wonder-sk committed Jun 5, 2014
1 parent 3e8f74f commit b12874b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/gui/raster/qgsmultibandcolorrendererwidget.cpp
Expand Up @@ -130,7 +130,7 @@ void QgsMultiBandColorRendererWidget::setCustomMinMaxValues( QgsMultiBandColorRe
bool redMinOk, redMaxOk;
double redMin = mRedMinLineEdit->text().toDouble( &redMinOk );
double redMax = mRedMaxLineEdit->text().toDouble( &redMaxOk );
if ( redMinOk && redMaxOk )
if ( redMinOk && redMaxOk && redBand != -1 )
{
redEnhancement = new QgsContrastEnhancement(( QGis::DataType )(
provider->dataType( redBand ) ) );
Expand All @@ -141,7 +141,7 @@ void QgsMultiBandColorRendererWidget::setCustomMinMaxValues( QgsMultiBandColorRe
bool greenMinOk, greenMaxOk;
double greenMin = mGreenMinLineEdit->text().toDouble( &greenMinOk );
double greenMax = mGreenMaxLineEdit->text().toDouble( &greenMaxOk );
if ( greenMinOk && greenMaxOk )
if ( greenMinOk && greenMaxOk && greenBand != -1 )
{
greenEnhancement = new QgsContrastEnhancement(( QGis::DataType )(
provider->dataType( greenBand ) ) );
Expand All @@ -152,7 +152,7 @@ void QgsMultiBandColorRendererWidget::setCustomMinMaxValues( QgsMultiBandColorRe
bool blueMinOk, blueMaxOk;
double blueMin = mBlueMinLineEdit->text().toDouble( &blueMinOk );
double blueMax = mBlueMaxLineEdit->text().toDouble( &blueMaxOk );
if ( blueMinOk && blueMaxOk )
if ( blueMinOk && blueMaxOk && blueBand != -1 )
{
blueEnhancement = new QgsContrastEnhancement(( QGis::DataType )(
provider->dataType( blueBand ) ) );
Expand Down
2 changes: 1 addition & 1 deletion src/providers/gdal/qgsgdalprovider.cpp
Expand Up @@ -1112,7 +1112,7 @@ QGis::DataType QgsGdalProvider::srcDataType( int bandNo ) const

QGis::DataType QgsGdalProvider::dataType( int bandNo ) const
{
if ( mGdalDataType.size() == 0 ) return QGis::UnknownDataType;
if ( bandNo <= 0 || bandNo > mGdalDataType.count() ) return QGis::UnknownDataType;

return dataTypeFromGdal( mGdalDataType[bandNo-1] );
}
Expand Down

0 comments on commit b12874b

Please sign in to comment.