[mapserver-commits] r9463 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2009-10-15 13:20:35 -0400 (Thu, 15 Oct 2009)
New Revision: 9463

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapagg.cpp
Log:
 fix problem with 0-length line patterns in AGG


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-10-15 09:20:56 UTC (rev 9462)
+++ trunk/mapserver/HISTORY.TXT	2009-10-15 17:20:35 UTC (rev 9463)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- fix problem with 0-length line patterns in AGG
+
 - Fixed problem of text/html WMS GetFeatureInfo which was returning HTML 
   image map output instead of the expected text/html template output.
   This was done by changing the imagemap outputformat to use the 

Modified: trunk/mapserver/mapagg.cpp
===================================================================
--- trunk/mapserver/mapagg.cpp	2009-10-15 09:20:56 UTC (rev 9462)
+++ trunk/mapserver/mapagg.cpp	2009-10-15 17:20:35 UTC (rev 9463)
@@ -1586,10 +1586,16 @@
 
     if (symbol->patternlength > 0)
     {
+        int nonzeroexists=0;
         for (i=0; i<symbol->patternlength; i++)
         {
-            symbol_pattern[i] = MS_MAX(symbol->pattern[i]*scalefactor,1);
+            symbol_pattern[i] = symbol->pattern[i]*scalefactor;
+            if(symbol_pattern[i]>0)
+                nonzeroexists=1;
         }
+        if(!nonzeroexists){
+            return;
+        }
     }
 
     mapserver::rgba8 agg_color,agg_ocolor,agg_bcolor;