Fix limited random color ramp always returns 1 less color than set

(cherry-picked from 1d98b10)
qgis · Aug 25, 2016 · b8ec8c9 · b8ec8c9
1 parent 38f4f08
commit b8ec8c9
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/core/symbology-ng/qgsvectorcolorrampv2.cpp b/src/core/symbology-ng/qgsvectorcolorrampv2.cpp
@@ -313,8 +313,11 @@ double QgsVectorRandomColorRampV2::value( int index ) const
 
 QColor QgsVectorRandomColorRampV2::color( double value ) const
 {
+  if ( value < 0 || value > 1 )
+    return QColor();
+
   int colorCnt = mColors.count();
-  int colorIdx = static_cast< int >( value * ( colorCnt - 1 ) );
+  int colorIdx = qMin( static_cast< int >( value * colorCnt ), colorCnt - 1 );
 
   if ( colorIdx >= 0 && colorIdx < colorCnt )
     return mColors.at( colorIdx );