Use a tolerance to decide if a point symbol may be used from cached. Because on some systems, dpi in x- and y-direction are different and so the scaleProduct is not exactly 1

mhugent · mhugent · commit f00e161d10e9 · 2009-08-19T19:47:41.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@11444 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/symbology/qgssymbol.cpp b/src/core/symbology/qgssymbol.cpp
@@ -381,8 +381,10 @@ QImage QgsSymbol::getCachedPointSymbolAsImage( double widthScale, bool selected,
 QImage QgsSymbol::getPointSymbolAsImage( double widthScale, bool selected, QColor selectionColor, double scale,
     double rotation, double rasterScaleFactor, double opacity )
 {
+  double scaleProduct = scale * rasterScaleFactor;
 
-  if ( 1.0 == ( scale * rasterScaleFactor ) && 0 == rotation )
+  //on systems where dpi in x- and y-direction are not the same, the scaleProduct may differ from 1.0 by a very small number
+  if ( scaleProduct > 0.9 && scaleProduct < 1.1 && 0 == rotation )
   {
     if ( mWidthScale < 0 || widthScale == mWidthScale )
     {

Original file line number	Diff line number	Diff line change
`@@ -381,8 +381,10 @@ QImage QgsSymbol::getCachedPointSymbolAsImage( double widthScale, bool selected,`
`381`	`381`	`QImage QgsSymbol::getPointSymbolAsImage( double widthScale, bool selected, QColor selectionColor, double scale,`
`382`	`382`	`double rotation, double rasterScaleFactor, double opacity )`
`383`	`383`	`{`
	`384`	`+ double scaleProduct = scale * rasterScaleFactor;`
`384`	`385`
`385`		`- if ( 1.0 == ( scale * rasterScaleFactor ) && 0 == rotation )`
	`386`	`+ //on systems where dpi in x- and y-direction are not the same, the scaleProduct may differ from 1.0 by a very small number`
	`387`	`+ if ( scaleProduct > 0.9 && scaleProduct < 1.1 && 0 == rotation )`
`386`	`388`	`{`
`387`	`389`	`if ( mWidthScale < 0 \|\| widthScale == mWidthScale )`
`388`	`390`	`{`