[mapserver-commits] r11843 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2011-06-21 09:40:12 -0700 (Tue, 21 Jun 2011)
New Revision: 11843

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapfile.c
   trunk/mapserver/mapsymbol.c
Log:
Applied patch for ticket #3589.

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-06-20 19:17:16 UTC (rev 11842)
+++ trunk/mapserver/HISTORY.TXT	2011-06-21 16:40:12 UTC (rev 11843)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk, 6.1-dev, future 6.2): 
 ------------------------------------------------- 
 
+- Applied patch for ticket (symbol writing issues) (#3589)
+
 - Added WMS GetFeatureInfo Cascading (#3764)
 
 - Fixed png lib is not found on multiarch systems (#3921)

Modified: trunk/mapserver/mapfile.c
===================================================================
--- trunk/mapserver/mapfile.c	2011-06-20 19:17:16 UTC (rev 11842)
+++ trunk/mapserver/mapfile.c	2011-06-21 16:40:12 UTC (rev 11843)
@@ -5241,7 +5241,7 @@
 
   /* write symbol with INLINE tag in mapfile */
   for(i=0; i<map->symbolset.numsymbols; i++) {
-    writeSymbol(map->symbolset.symbol[i], stream);
+    if(map->symbolset.symbol[i]->inmapfile) writeSymbol(map->symbolset.symbol[i], stream);
   }
 
   writeProjection(stream, indent, &(map->projection));

Modified: trunk/mapserver/mapsymbol.c
===================================================================
--- trunk/mapserver/mapsymbol.c	2011-06-20 19:17:16 UTC (rev 11842)
+++ trunk/mapserver/mapsymbol.c	2011-06-21 16:40:12 UTC (rev 11843)
@@ -274,8 +274,6 @@
 {
   int i;
 
-  if(s->inmapfile != MS_TRUE) return;
-
   fprintf(stream, "  SYMBOL\n");
   if(s->name != NULL) fprintf(stream, "    NAME \"%s\"\n", s->name);
   
@@ -734,7 +732,6 @@
     }
     /* Don't ever write out the default symbol at index 0 */
     for (i=1; i<symbolset->numsymbols; i++) {
-        symbolset->symbol[i]->inmapfile = MS_TRUE;
         writeSymbol((symbolset->symbol[i]), stream);
     }
     return MS_SUCCESS;