[mapserver-commits] r11209 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2011-03-17 12:45:31 -0700 (Thu, 17 Mar 2011)
New Revision: 11209

Modified:
   trunk/mapserver/maprendering.c
Log:
don't apply scale to symbol if it is =1


Modified: trunk/mapserver/maprendering.c
===================================================================
--- trunk/mapserver/maprendering.c	2011-03-17 19:44:08 UTC (rev 11208)
+++ trunk/mapserver/maprendering.c	2011-03-17 19:45:31 UTC (rev 11209)
@@ -592,10 +592,14 @@
             }
 
 
+            if(s.scale != 1) {
+               pw = MS_NINT(symbol->sizex * s.scale)+1+style->gap;
+               ph = MS_NINT(symbol->sizey * s.scale)+1+style->gap;
+            } else {
+               pw = symbol->sizex + style->gap;
+               ph = symbol->sizey + style->gap;
+            }
 
-            pw = MS_NINT(symbol->sizex * s.scale)+1+style->gap;
-            ph = MS_NINT(symbol->sizey * s.scale)+1+style->gap;
-
             /* if we're doing vector symbols with an antialiased pixel rendererer, we want to enable
              * seamless mode, i.e. comute a tile that accounts for the blending of neighbouring
              * tiles at the tile border