Prevent division by 0

mhugent · mhugent · commit d2c979fb7ab3 · 2010-01-14T21:48:24.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@12764 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/symbology-ng/qgssymbollayerv2utils.cpp b/src/core/symbology-ng/qgssymbollayerv2utils.cpp
@@ -657,7 +657,15 @@ double QgsSymbolLayerV2Utils::pixelSizeScaleFactor( QgsRenderContext& c, QgsSymb
   }
   else //QgsSymbol::MapUnit
   {
-    return c.rasterScaleFactor() / c.mapToPixel().mapUnitsPerPixel();
+    double mup = c.mapToPixel().mapUnitsPerPixel();
+    if ( mup > 0 )
+    {
+      return c.rasterScaleFactor() / c.mapToPixel().mapUnitsPerPixel();
+    }
+    else
+    {
+      return 1.0;
+    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -657,7 +657,15 @@ double QgsSymbolLayerV2Utils::pixelSizeScaleFactor( QgsRenderContext& c, QgsSymb`
`657`	`657`	`}`
`658`	`658`	`else //QgsSymbol::MapUnit`
`659`	`659`	`{`
`660`		`- return c.rasterScaleFactor() / c.mapToPixel().mapUnitsPerPixel();`
	`660`	`+ double mup = c.mapToPixel().mapUnitsPerPixel();`
	`661`	`+ if ( mup > 0 )`
	`662`	`+ {`
	`663`	`+ return c.rasterScaleFactor() / c.mapToPixel().mapUnitsPerPixel();`
	`664`	`+ }`
	`665`	`+ else`
	`666`	`+ {`
	`667`	`+ return 1.0;`
	`668`	`+ }`
`661`	`669`	`}`
`662`	`670`	`}`
`663`	`671`