[mapserver-commits] r9893 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2010-02-24 12:38:24 -0500 (Wed, 24 Feb 2010)
New Revision: 9893

Modified:
   trunk/mapserver/mapogcsld.c
   trunk/mapserver/mapsymbol.c
Log:
use local static copies for pngsig and jpegsig

Modified: trunk/mapserver/mapogcsld.c
===================================================================
--- trunk/mapserver/mapogcsld.c	2010-02-24 04:46:59 UTC (rev 9892)
+++ trunk/mapserver/mapogcsld.c	2010-02-24 17:38:24 UTC (rev 9893)
@@ -51,9 +51,6 @@
 #define SLD_MARK_SYMBOL_X "sld_mark_symbol_x"
 #define SLD_MARK_SYMBOL_X_FILLED "sld_mark_symbol_x_filled"
 
-
-
-
 /************************************************************************/
 /*                             msSLDApplySLDURL                         */
 /*                                                                      */
@@ -2163,7 +2160,8 @@
     return nSymbolId;
 }
 
-extern unsigned char PNGsig[8];
+static const unsigned char PNGsig[8] = {137, 80, 78, 71, 13, 10, 26, 10}; /* 89 50 4E 47 0D 0A 1A 0A hex */
+
 /************************************************************************/
 /*                          msSLDGetGraphicSymbol                       */
 /*                                                                      */

Modified: trunk/mapserver/mapsymbol.c
===================================================================
--- trunk/mapserver/mapsymbol.c	2010-02-24 04:46:59 UTC (rev 9892)
+++ trunk/mapserver/mapsymbol.c	2010-02-24 17:38:24 UTC (rev 9893)
@@ -44,8 +44,8 @@
 extern int msyylineno;
 extern FILE *msyyin;
 
-extern unsigned char PNGsig[8];
-extern unsigned char JPEGsig[3];
+static const unsigned char PNGsig[8] = {137, 80, 78, 71, 13, 10, 26, 10}; /* 89 50 4E 47 0D 0A 1A 0A hex */
+static const unsigned char JPEGsig[3] = {255, 216, 255}; /* FF D8 FF hex */
 
 /*
 ** Symbol to string static arrays needed for writing map files.