[mapserver-commits] r9349 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2009-09-25 12:03:46 -0400 (Fri, 25 Sep 2009)
New Revision: 9349

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapfile.c
   trunk/mapserver/mapproject.h
   trunk/mapserver/mapserver.h
   trunk/mapserver/mapwms.c
Log:
Remove msLoadProjectionString{,EPSG} prototypes from mapserver.h, to 
avoid duplicating the ones in mapproject.h, and made passed in string
const to avoid warnings.


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-09-25 01:25:41 UTC (rev 9348)
+++ trunk/mapserver/HISTORY.TXT	2009-09-25 16:03:46 UTC (rev 9349)
@@ -16,6 +16,8 @@
 
  - support axis odering for WFS 1.1 (#2899)
 
+ - const changes to avoid warnings with msLoadProjectionString()
+
 Version 5.6.0-beta1 (2009-09-23):
 ---------------------------------
 

Modified: trunk/mapserver/mapfile.c
===================================================================
--- trunk/mapserver/mapfile.c	2009-09-25 01:25:41 UTC (rev 9348)
+++ trunk/mapserver/mapfile.c	2009-09-25 16:03:46 UTC (rev 9349)
@@ -1105,7 +1105,7 @@
 /*      certain code ranges.                                            */
 /*      Use for now in WMS 1.3.0                                        */
 /************************************************************************/
-int msLoadProjectionStringEPSG(projectionObj *p, char *value)
+int msLoadProjectionStringEPSG(projectionObj *p, const char *value)
 {
     p->gt.need_geotransform = MS_FALSE;
     
@@ -1133,7 +1133,7 @@
 }
 
 
-int msLoadProjectionString(projectionObj *p, char *value)
+int msLoadProjectionString(projectionObj *p, const char *value)
 {
   p->gt.need_geotransform = MS_FALSE;
 

Modified: trunk/mapserver/mapproject.h
===================================================================
--- trunk/mapserver/mapproject.h	2009-09-25 01:25:41 UTC (rev 9348)
+++ trunk/mapserver/mapproject.h	2009-09-25 16:03:46 UTC (rev 9349)
@@ -73,7 +73,8 @@
 MS_DLL_EXPORT void msFreeProjection(projectionObj *p);
 MS_DLL_EXPORT int msInitProjection(projectionObj *p);
 MS_DLL_EXPORT int msProcessProjection(projectionObj *p);
-MS_DLL_EXPORT int msLoadProjectionString(projectionObj *p, char *value);
+MS_DLL_EXPORT int msLoadProjectionString(projectionObj *p, const char *value);
+MS_DLL_EXPORT int msLoadProjectionStringEPSG(projectionObj *p, const char *value);
 MS_DLL_EXPORT char *msGetProjectionString(projectionObj *proj);
 MS_DLL_EXPORT void msAxisNormalizePoints( projectionObj *proj, int count,
                                           double *x, double *y );

Modified: trunk/mapserver/mapserver.h
===================================================================
--- trunk/mapserver/mapserver.h	2009-09-25 01:25:41 UTC (rev 9348)
+++ trunk/mapserver/mapserver.h	2009-09-25 16:03:46 UTC (rev 9349)
@@ -1600,9 +1600,6 @@
 MS_DLL_EXPORT featureListNodeObjPtr insertFeatureList(featureListNodeObjPtr *list, shapeObj *shape);
 MS_DLL_EXPORT void freeFeatureList(featureListNodeObjPtr list);
 
-MS_DLL_EXPORT int msLoadProjectionString(projectionObj *p, char *value);
-MS_DLL_EXPORT int msLoadProjectionStringEPSG(projectionObj *p, char *value);
-
 /* To be used *only* within the mapfile loading phase */
 MS_DLL_EXPORT int loadExpressionString(expressionObj *exp, char *value);
 /* Use this next, thread safe wrapper, function everywhere else */

Modified: trunk/mapserver/mapwms.c
===================================================================
--- trunk/mapserver/mapwms.c	2009-09-25 01:25:41 UTC (rev 9348)
+++ trunk/mapserver/mapwms.c	2009-09-25 16:03:46 UTC (rev 9349)
@@ -37,6 +37,7 @@
 #include "mapogcsld.h"
 
 #include "maptime.h"
+#include "mapproject.h"
 
 #include <stdarg.h>
 #include <time.h>