[mapserver-commits] r11882 - branches/branch-6-0/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2011-07-07 21:03:49 -0700 (Thu, 07 Jul 2011)
New Revision: 11882

Modified:
   branches/branch-6-0/mapserver/HISTORY.TXT
   branches/branch-6-0/mapserver/mapfile.c
   branches/branch-6-0/mapserver/mapsymbol.c
Log:
Applied patch for ticket (symbol writing issues) (#3589).

Modified: branches/branch-6-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-6-0/mapserver/HISTORY.TXT	2011-07-07 19:55:43 UTC (rev 11881)
+++ branches/branch-6-0/mapserver/HISTORY.TXT	2011-07-08 04:03:49 UTC (rev 11882)
@@ -14,6 +14,8 @@
 
 Version 6.0.1 (SVN branch-6-0):
 ---------------------------
+- Applied patch for ticket (symbol writing issues) (#3589)
+
 - Fix performance issue with Oracle and scrollable cursors (#3905)
 
 - Fix attribute binding for layer styles (#3941)

Modified: branches/branch-6-0/mapserver/mapfile.c
===================================================================
--- branches/branch-6-0/mapserver/mapfile.c	2011-07-07 19:55:43 UTC (rev 11881)
+++ branches/branch-6-0/mapserver/mapfile.c	2011-07-08 04:03:49 UTC (rev 11882)
@@ -5261,7 +5261,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: branches/branch-6-0/mapserver/mapsymbol.c
===================================================================
--- branches/branch-6-0/mapserver/mapsymbol.c	2011-07-07 19:55:43 UTC (rev 11881)
+++ branches/branch-6-0/mapserver/mapsymbol.c	2011-07-08 04:03:49 UTC (rev 11882)
@@ -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);
   
@@ -726,17 +724,16 @@
 }
 
 int msSaveSymbolSetStream(symbolSetObj *symbolset, FILE *stream) {
-    int i;
-    if (!symbolset || !stream) {
-        msSetError(MS_SYMERR, "Cannot save symbolset.", "msSaveSymbolSetStream()");
-        return MS_FAILURE;
-    }
-    /* 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;
+  int i; 
+  if (!symbolset || !stream) { 
+    msSetError(MS_SYMERR, "Cannot save symbolset.", "msSaveSymbolSetStream()"); 
+    return MS_FAILURE; 
+  } 
+  /* Don't ever write out the default symbol at index 0 */ 
+  for (i=1; i<symbolset->numsymbols; i++) { 
+    if(!symbolset->symbol[i]->inmapfile) writeSymbol((symbolset->symbol[i]), stream); 
+  } 
+  return MS_SUCCESS;
 }
 
 int msSaveSymbolSet(symbolSetObj *symbolset, const char *filename) {