[mapserver-commits] r13064 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2012-02-06 11:39:02 -0800 (Mon, 06 Feb 2012)
New Revision: 13064

Modified:
   trunk/mapserver/maplabel.c
   trunk/mapserver/mapserver.h
Log:
fix const char* warnings (#4114)


Modified: trunk/mapserver/maplabel.c
===================================================================
--- trunk/mapserver/maplabel.c	2012-02-06 19:29:48 UTC (rev 13063)
+++ trunk/mapserver/maplabel.c	2012-02-06 19:39:02 UTC (rev 13064)
@@ -700,7 +700,7 @@
 }
 
 int msGetTruetypeTextBBox(rendererVTableObj *renderer, char* fontstring, fontSetObj *fontset, double size, char *string, rectObj *rect, double **advances) {
-   const char *lookedUpFonts[MS_MAX_LABEL_FONTS];
+   char *lookedUpFonts[MS_MAX_LABEL_FONTS];
    int numfonts;
    if(MS_FAILURE == msFontsetLookupFonts(fontstring, &numfonts, fontset, lookedUpFonts))
       return MS_FAILURE;
@@ -813,7 +813,7 @@
 	return font;
 }
 
-int msFontsetLookupFonts(char* fontstring, int *numfonts, fontSetObj *fontset, const char **lookedUpFonts) {
+int msFontsetLookupFonts(char* fontstring, int *numfonts, fontSetObj *fontset, char **lookedUpFonts) {
 	char *start,*ptr;
    *numfonts = 0;
    start = ptr = fontstring;

Modified: trunk/mapserver/mapserver.h
===================================================================
--- trunk/mapserver/mapserver.h	2012-02-06 19:29:48 UTC (rev 13063)
+++ trunk/mapserver/mapserver.h	2012-02-06 19:39:02 UTC (rev 13064)
@@ -1988,7 +1988,7 @@
 MS_DLL_EXPORT int msInitFontSet(fontSetObj *fontset);
 MS_DLL_EXPORT int msFreeFontSet(fontSetObj *fontset);
 MS_DLL_EXPORT char *msFontsetLookupFont(fontSetObj *fontset, char *fontKey);
-MS_DLL_EXPORT int msFontsetLookupFonts(char* fontstring, int *numfonts, fontSetObj *fontset, const char **lookedUpFonts);
+MS_DLL_EXPORT int msFontsetLookupFonts(char* fontstring, int *numfonts, fontSetObj *fontset, char **lookedUpFonts);
 
 MS_DLL_EXPORT char *msTransformLabelText(mapObj *map, imageObj* image, labelObj *label, char *text);
 MS_DLL_EXPORT int msGetTruetypeTextBBox(rendererVTableObj *renderer, char* fontstring, fontSetObj *fontset, double size, char *string, rectObj *rect, double **advances);
@@ -2613,8 +2613,8 @@
  * labelStyleObj
  */
 typedef struct {
-    /* full path to truetype font file */
-    const char* fonts[MS_MAX_LABEL_FONTS];
+    /* full paths to truetype font file */
+    char* fonts[MS_MAX_LABEL_FONTS];
     int numfonts;
     double size;
     double rotation;