[mapserver-commits] r12766 - trunk/mapserver

[svn at osgeo.org]

Author: rouault
Date: 2011-11-11 12:03:50 -0800 (Fri, 11 Nov 2011)
New Revision: 12766

Modified:
   trunk/mapserver/maperror.c
   trunk/mapserver/mapgd.c
Log:
Just to make gcc happier.

Modified: trunk/mapserver/maperror.c
===================================================================
--- trunk/mapserver/maperror.c	2011-11-09 13:00:28 UTC (rev 12765)
+++ trunk/mapserver/maperror.c	2011-11-11 20:03:50 UTC (rev 12766)
@@ -135,7 +135,7 @@
     else if( link == NULL || link->next == NULL )
     {
         te_info_t *new_link;
-        errorObj   error_obj = { MS_NOERR, "", "", NULL };
+        errorObj   error_obj = { MS_NOERR, "", "", 0 };
 
         new_link = (te_info_t *) malloc(sizeof(te_info_t));
         new_link->next = error_list;

Modified: trunk/mapserver/mapgd.c
===================================================================
--- trunk/mapserver/mapgd.c	2011-11-09 13:00:28 UTC (rev 12765)
+++ trunk/mapserver/mapgd.c	2011-11-11 20:03:50 UTC (rev 12766)
@@ -389,7 +389,7 @@
    gdImagePtr ip;
    char *error=NULL;
    int bbox[8];
-   int c,oc;
+   int c = 0,oc = 0;
    x = MS_NINT(x);
    y = MS_NINT(y);
    if(!(ip = MS_IMAGE_GET_GDIMAGEPTR(img))) return MS_FAILURE;
@@ -643,7 +643,7 @@
 int renderTruetypeSymbolGD(imageObj *img, double x, double y, symbolObj *symbol, symbolStyleObj *s) {
    int bbox[8];
    char *error;
-   int c,oc;
+   int c,oc = 0;
    gdImagePtr ip;
    if(!(ip = MS_IMAGE_GET_GDIMAGEPTR(img))) return MS_FAILURE;
    SETPEN(ip, s->color);