Merge branch 'master' of github.com:mapserver/mapserver

MapServer · Apr 24, 2012 · 41b1e4d · 41b1e4d
2 parents bf90207 + 572770e
commit 41b1e4d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/mapchart.c b/mapchart.c
@@ -338,6 +338,8 @@ int msDrawPieChartLayer(mapObj *map, layerObj *layer, imageObj *image)
     styleObj **styles;
     pointObj center;
     int numvalues = layer->numclasses; /* the number of classes to represent in the graph */
+    int numvalues_for_shape = 0;
+
     if(chartSizeProcessingKey==NULL)
     {
         chartRangeProcessingKey=msLayerGetProcessingKey( layer,"CHART_SIZE_RANGE" );
@@ -369,7 +371,6 @@ int msDrawPieChartLayer(mapObj *map, layerObj *layer, imageObj *image)
         return MS_FAILURE;
     }
 
-    int numvalues_for_shape = 0;
     while(MS_SUCCESS == getNextShape(map,layer,values,&numvalues_for_shape,styles,&shape)) {
        if(chartRangeProcessingKey!=NULL) 
           numvalues_for_shape--;

diff --git a/mapfile.c b/mapfile.c
@@ -4671,7 +4671,7 @@ static void writeOutputformat(FILE *stream, int indent, mapObj *map)
 
   writeOutputformatobject(stream, indent, map->outputformat);
   for(i=0; i<map->numoutputformats; i++) {
-    if(map->outputformatlist[i]->inmapfile == MS_TRUE && strcmp(map->outputformatlist[i]->driver, map->outputformat->driver) != 0)
+    if(map->outputformatlist[i]->inmapfile == MS_TRUE && strcmp(map->outputformatlist[i]->name, map->outputformat->name) != 0)
       writeOutputformatobject(stream, indent, map->outputformatlist[i]);
   }
 }