[mapserver-commits] r7857 - branches/branch-5-2/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2008-08-15 03:45:55 -0400 (Fri, 15 Aug 2008)
New Revision: 7857

Modified:
   branches/branch-5-2/mapserver/HISTORY.TXT
   branches/branch-5-2/mapserver/mapagg.cpp
Log:
fix pixmap symbols not drawing if no color was specified (#2736)

Modified: branches/branch-5-2/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-2/mapserver/HISTORY.TXT	2008-08-15 07:42:24 UTC (rev 7856)
+++ branches/branch-5-2/mapserver/HISTORY.TXT	2008-08-15 07:45:55 UTC (rev 7857)
@@ -12,6 +12,7 @@
 
 Current Version (SVN branch-5-2)
 --------------------------------
+- AGG: fix pixmap symbols not drawing if no color was specified (#2736)
 
 - Accept WMS requests in which the optional SERVICE param is missing. 
   A new test was incorrectly added in 5.2.0 that resulted in the error 

Modified: branches/branch-5-2/mapserver/mapagg.cpp
===================================================================
--- branches/branch-5-2/mapserver/mapagg.cpp	2008-08-15 07:42:24 UTC (rev 7856)
+++ branches/branch-5-2/mapserver/mapagg.cpp	2008-08-15 07:45:55 UTC (rev 7857)
@@ -1579,7 +1579,9 @@
     } else if(agg_ocolor.a) {
         color = &(agg_ocolor);// try the outline color, polygons drawing thick outlines often do this
     } else {
-            return; // no color, bail out... 
+        if(symbol->type != MS_SYMBOL_PIXMAP)
+            //all symbols except pixmap symbols must specify a color
+            return;
     }
     
     //transform the shapeobj to something AGG understands