[QGIS Commit] r12764 - trunk/qgis/src/core/symbology-ng

svn_qgis at osgeo.org svn_qgis at osgeo.org
Thu Jan 14 16:48:24 EST 2010


Author: mhugent
Date: 2010-01-14 16:48:24 -0500 (Thu, 14 Jan 2010)
New Revision: 12764

Modified:
   trunk/qgis/src/core/symbology-ng/qgssymbollayerv2utils.cpp
Log:
Prevent division by 0

Modified: trunk/qgis/src/core/symbology-ng/qgssymbollayerv2utils.cpp
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgssymbollayerv2utils.cpp	2010-01-14 21:36:35 UTC (rev 12763)
+++ trunk/qgis/src/core/symbology-ng/qgssymbollayerv2utils.cpp	2010-01-14 21:48:24 UTC (rev 12764)
@@ -657,7 +657,15 @@
   }
   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;
+    }
   }
 }
 



More information about the QGIS-commit mailing list