[mapserver-commits] r11313 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2011-03-23 10:39:20 -0700 (Wed, 23 Mar 2011)
New Revision: 11313

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maprendering.c
Log:
assure that a created tile has a non-zero width and height (#3370)


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-03-23 15:49:45 UTC (rev 11312)
+++ trunk/mapserver/HISTORY.TXT	2011-03-23 17:39:20 UTC (rev 11313)
@@ -14,8 +14,10 @@
 
 Current Version (SVN trunk):
 ----------------------------
- - use png_sig_cmp instead of png_check_sig (#3762)
+- assure that a created tile has a non-zero width and height (#3370)
 
+- use png_sig_cmp instead of png_check_sig (#3762)
+
 - Rendering: scale style OFFSET and GAP the same way we scale other style attributes.
   Beforehand, we scaled them proportionaly to the computeed width.
 

Modified: trunk/mapserver/maprendering.c
===================================================================
--- trunk/mapserver/maprendering.c	2011-03-23 15:49:45 UTC (rev 11312)
+++ trunk/mapserver/maprendering.c	2011-03-23 17:39:20 UTC (rev 11313)
@@ -596,6 +596,8 @@
                pw = symbol->sizex + s.gap;
                ph = symbol->sizey + s.gap;
             }
+            if(pw<1) pw=1;
+            if(ph<1) ph=1;
 
             /* 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