[mapserver-commits] r9540 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2009-11-11 06:05:37 -0500 (Wed, 11 Nov 2009)
New Revision: 9540

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapagg.cpp
Log:
 decode html and unicode entities for polygon truetype symbol fills

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-11-10 18:20:31 UTC (rev 9539)
+++ trunk/mapserver/HISTORY.TXT	2009-11-11 11:05:37 UTC (rev 9540)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- decode html and unicode entities for polygon truetype symbol fills
+
 - Parse PropertyName parameter for wfs requests (#675)
 
 - Fixed when saving a map, layer->transform isn't written properly in all cases. (#3198)

Modified: trunk/mapserver/mapagg.cpp
===================================================================
--- trunk/mapserver/mapagg.cpp	2009-11-10 18:20:31 UTC (rev 9539)
+++ trunk/mapserver/mapagg.cpp	2009-11-11 11:05:37 UTC (rev 9540)
@@ -1941,7 +1941,9 @@
             if(!font)
                 break;
             double gap=(symbol->gap>0)?symbol->gap*size:0;
-            ren->renderPathTruetypeTiled(*polygons,font,(unsigned int)((unsigned char)symbol->character[0]),size,
+            int unicode;
+            msUTF8ToUniChar(symbol->character, &unicode);
+            ren->renderPathTruetypeTiled(*polygons,font,unicode,size,
                     gap,agg_color,agg_bcolor,agg_ocolor);
             //FIXME: allow drawing an outline on the polygon to avoid
             //faint outlines