[mapserver-commits] r11844 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2011-06-21 12:59:33 -0700 (Tue, 21 Jun 2011)
New Revision: 11844

Modified:
   trunk/mapserver/mapsymbol.c
Log:
Make sure symbols defined in a mapfile are not written when saving a symbolset (related to #3589).

Modified: trunk/mapserver/mapsymbol.c
===================================================================
--- trunk/mapserver/mapsymbol.c	2011-06-21 16:40:12 UTC (rev 11843)
+++ trunk/mapserver/mapsymbol.c	2011-06-21 19:59:33 UTC (rev 11844)
@@ -725,16 +725,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++) {
-        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(!map->symbolset.symbol[i]->inmapfile) writeSymbol((symbolset->symbol[i]), stream);
+  }
+  return MS_SUCCESS;
 }
 
 int msSaveSymbolSet(symbolSetObj *symbolset, const char *filename) {