Fix incorrect values returned by certain color ramps

nyalldawson · nyalldawson · commit eb3cee1bf3cd · 2015-08-04T21:26:43.000+10:00
(cherry-picked from 27ee8ee)
diff --git a/src/core/symbology-ng/qgsvectorcolorrampv2.cpp b/src/core/symbology-ng/qgsvectorcolorrampv2.cpp
@@ -291,7 +291,7 @@ QgsVectorColorRampV2* QgsVectorRandomColorRampV2::create( const QgsStringMap& pr
 double QgsVectorRandomColorRampV2::value( int index ) const
 {
   if ( mColors.size() < 1 ) return 0;
-  return index / mColors.size() - 1;
+  return ( double )index / ( mColors.size() - 1 );
 }
 
 QColor QgsVectorRandomColorRampV2::color( double value ) const
@@ -489,7 +489,7 @@ QList<int> QgsVectorColorBrewerColorRampV2::listSchemeVariants( QString schemeNa
 double QgsVectorColorBrewerColorRampV2::value( int index ) const
 {
   if ( mPalette.size() < 1 ) return 0;
-  return index / mPalette.size() - 1;
+  return ( double )index / ( mPalette.size() - 1 );
 }
 
 QColor QgsVectorColorBrewerColorRampV2::color( double value ) const

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ QgsVectorColorRampV2* QgsVectorRandomColorRampV2::create( const QgsStringMap& pr`
`291`	`291`	`double QgsVectorRandomColorRampV2::value( int index ) const`
`292`	`292`	`{`
`293`	`293`	`if ( mColors.size() < 1 ) return 0;`
`294`		`- return index / mColors.size() - 1;`
	`294`	`+ return ( double )index / ( mColors.size() - 1 );`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`QColor QgsVectorRandomColorRampV2::color( double value ) const`
`@@ -489,7 +489,7 @@ QList<int> QgsVectorColorBrewerColorRampV2::listSchemeVariants( QString schemeNa`
`489`	`489`	`double QgsVectorColorBrewerColorRampV2::value( int index ) const`
`490`	`490`	`{`
`491`	`491`	`if ( mPalette.size() < 1 ) return 0;`
`492`		`- return index / mPalette.size() - 1;`
	`492`	`+ return ( double )index / ( mPalette.size() - 1 );`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`QColor QgsVectorColorBrewerColorRampV2::color( double value ) const`