Fix crash when choosing a null field for categorized style

slarosa · slarosa · commit 3d2747c6071f · 2014-10-12T23:32:55.000+02:00
diff --git a/src/core/symbology-ng/qgsvectorcolorrampv2.cpp b/src/core/symbology-ng/qgsvectorcolorrampv2.cpp
@@ -30,6 +30,7 @@
 
 static QColor _interpolate( QColor c1, QColor c2, double value )
 {
+  if ( isnan( value ) ) value = 1;
   int r = ( int )( c1.red() + value * ( c2.red() - c1.red() ) );
   int g = ( int )( c1.green() + value * ( c2.green() - c1.green() ) );
   int b = ( int )( c1.blue() + value * ( c2.blue() - c1.blue() ) );
@@ -365,11 +366,10 @@ double QgsRandomColorsV2::value( int index ) const
 
 QColor QgsRandomColorsV2::color( double value ) const
 {
-  Q_UNUSED( value );
   int minVal = 130;
   int maxVal = 255;
 
-  int colorIndex = value * ( mTotalColorCount - 1 );
+  int colorIndex = !isnan( value ) ? value : 1 * ( mTotalColorCount - 1 );
   if ( mTotalColorCount >= 1 && mPrecalculatedColors.length() > colorIndex )
   {
     //use precalculated hue

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`
`31`	`31`	`static QColor _interpolate( QColor c1, QColor c2, double value )`
`32`	`32`	`{`
	`33`	`+ if ( isnan( value ) ) value = 1;`
`33`	`34`	`int r = ( int )( c1.red() + value * ( c2.red() - c1.red() ) );`
`34`	`35`	`int g = ( int )( c1.green() + value * ( c2.green() - c1.green() ) );`
`35`	`36`	`int b = ( int )( c1.blue() + value * ( c2.blue() - c1.blue() ) );`
`@@ -365,11 +366,10 @@ double QgsRandomColorsV2::value( int index ) const`
`365`	`366`
`366`	`367`	`QColor QgsRandomColorsV2::color( double value ) const`
`367`	`368`	`{`
`368`		`- Q_UNUSED( value );`
`369`	`369`	`int minVal = 130;`
`370`	`370`	`int maxVal = 255;`
`371`	`371`
`372`		`- int colorIndex = value * ( mTotalColorCount - 1 );`
	`372`	`+ int colorIndex = !isnan( value ) ? value : 1 * ( mTotalColorCount - 1 );`
`373`	`373`	`if ( mTotalColorCount >= 1 && mPrecalculatedColors.length() > colorIndex )`
`374`	`374`	`{`
`375`	`375`	`//use precalculated hue`