Merge branch 'branch-6-2' of github.com:/mapserver/mapserver into travis

MapServer · Sep 13, 2012 · 447511a · 447511a
2 parents dbf8770 + 70248be
commit 447511a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/maperror.c b/maperror.c
@@ -532,6 +532,9 @@ char *msGetVersion()
 #ifdef USE_CAIRO
   strcat(version, " SUPPORTS=CAIRO");
 #endif
+#ifdef USE_SVG_CAIRO
+  strcat(version, " SUPPORTS=SVG_SYMBOLS");
+#endif
 #ifdef USE_OGL
   strcat(version, " SUPPORTS=OPENGL");
 #endif

diff --git a/mapwms.c b/mapwms.c
@@ -2023,7 +2023,7 @@ int msDumpLayer(mapObj *map, layerObj *lp, int nVersion, const char *script_url_
   const char *pszLegendURL=NULL;
   char *pszMetadataName=NULL, *mimetype=NULL;
   char **classgroups = NULL;
-  int iclassgroups=0 ,j=0;
+  int iclassgroups=0;
   char szVersionBuf[OWS_VERSION_MAXLEN];
   size_t bufferSize = 0;
   const char *pszDimensionlist=NULL;
@@ -2355,7 +2355,7 @@ int msDumpLayer(mapObj *map, layerObj *lp, int nVersion, const char *script_url_
             }
           }
           if (classnameset) {
-            int k, l, size_x=0, size_y=0, num_layers=0;
+            int j=0, k=0, l=0, size_x=0, size_y=0, num_layers=0;
             int *group_layers = (int *)msSmallMalloc(sizeof(int)*map->numlayers);
             char ***nestedGroups = NULL;
             int *numNestedGroups = NULL;