Fix bad alloc when styling raster with random color ramp (fix #13112)

nyalldawson · nyalldawson · commit a8ad5c1fcbcb · 2015-08-04T21:22:40.000+10:00
(cherry-picked from 688ac16)
diff --git a/src/core/symbology-ng/qgsvectorcolorrampv2.cpp b/src/core/symbology-ng/qgsvectorcolorrampv2.cpp
@@ -372,7 +372,7 @@ QgsRandomColorsV2::~QgsRandomColorsV2()
 
 int QgsRandomColorsV2::count() const
 {
-  return INT_MAX;
+  return -1;
 }
 
 double QgsRandomColorsV2::value( int index ) const
diff --git a/src/core/symbology-ng/qgsvectorcolorrampv2.h b/src/core/symbology-ng/qgsvectorcolorrampv2.h
@@ -28,10 +28,12 @@ class CORE_EXPORT QgsVectorColorRampV2
 
     virtual ~QgsVectorColorRampV2() {}
 
-    // Number of defined colors
+    /** Returns number of defined colors, or -1 if undefined
+     */
     virtual int count() const = 0;
 
-    // Relative value (0,1) of color at index
+    /** Returns relative value between [0,1] of color at specified index
+     */
     virtual double value( int index ) const = 0;
 
     virtual QColor color( double value ) const = 0;
diff --git a/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp b/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
@@ -350,6 +350,17 @@ void QgsSingleBandPseudoColorRendererWidget::on_mColorRampComboBox_currentIndexC
   Q_UNUSED( index );
   QSettings settings;
   settings.setValue( "/Raster/defaultPalette", mColorRampComboBox->currentText() );
+
+  QgsVectorColorRampV2* ramp = mColorRampComboBox->currentColorRamp();
+  if ( !ramp )
+    return;
+
+  bool enableContinuous = ( ramp->count() > 0 );
+  mClassificationModeComboBox->setEnabled( enableContinuous );
+  if ( !enableContinuous )
+  {
+    mClassificationModeComboBox->setCurrentIndex( mClassificationModeComboBox->findData( EqualInterval ) );
+  }
 }
 
 void QgsSingleBandPseudoColorRendererWidget::populateColormapTreeWidget( const QList<QgsColorRampShader::ColorRampItem>& colorRampItems )

Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,7 @@ QgsRandomColorsV2::~QgsRandomColorsV2()`
`372`	`372`
`373`	`373`	`int QgsRandomColorsV2::count() const`
`374`	`374`	`{`
`375`		`- return INT_MAX;`
	`375`	`+ return -1;`
`376`	`376`	`}`
`377`	`377`
`378`	`378`	`double QgsRandomColorsV2::value( int index ) const`