[mapserver-commits] r11312 - branches/branch-5-6/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2011-03-23 08:49:45 -0700 (Wed, 23 Mar 2011)
New Revision: 11312

Modified:
   branches/branch-5-6/mapserver/HISTORY.TXT
   branches/branch-5-6/mapserver/mapagg.cpp
Log:
Fixed false computation of symbol size when used as a brush on line (#3760)


Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2011-03-23 15:28:19 UTC (rev 11311)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2011-03-23 15:49:45 UTC (rev 11312)
@@ -1,4 +1,4 @@
-MapServer Revision History
+MapServer Revsion History
 ==========================
 
 $Id$
@@ -13,6 +13,7 @@
 
 Version 5.6.7 (SVN branch-5-6):
 ---------------------------
+- Fixed false computation of symbol size when used as a brush on line (#3760)
 
 - Fixed SQL Spatial to be able to use UniqueIdentifier field as unique key (#3722)
 

Modified: branches/branch-5-6/mapserver/mapagg.cpp
===================================================================
--- branches/branch-5-6/mapserver/mapagg.cpp	2011-03-23 15:28:19 UTC (rev 11311)
+++ branches/branch-5-6/mapserver/mapagg.cpp	2011-03-23 15:49:45 UTC (rev 11312)
@@ -1694,8 +1694,8 @@
                 symbol = msRotateSymbol(symbol, style->angle);
             }
 
-            int pw =(int) ceil(symbol->sizex*d);    
-            int ph =(int) ceil(symbol->sizey*d);
+            int pw =(int) MS_MAX(1,ceil(symbol->sizex*d));    
+            int ph =(int) MS_MAX(1,ceil(symbol->sizey*d));
             
             
             if((pw <= 1) && (ph <= 1)) { // No sense using a tile, just draw a simple line