[mapserver-commits] r10813 - trunk/mapserver

[svn at osgeo.org]

Author: rouault
Date: 2010-12-22 11:07:34 -0800 (Wed, 22 Dec 2010)
New Revision: 10813

Modified:
   trunk/mapserver/mapdraw.c
   trunk/mapserver/mapwcs20.c
Log:
Hopefully unbreak Windows compilation due to variable declares in the middle of a block in a C file

Modified: trunk/mapserver/mapdraw.c
===================================================================
--- trunk/mapserver/mapdraw.c	2010-12-22 05:04:34 UTC (rev 10812)
+++ trunk/mapserver/mapdraw.c	2010-12-22 19:07:34 UTC (rev 10813)
@@ -1407,12 +1407,13 @@
    * do not enter the image */
   if(layer->class[c]->numstyles > 0 && layer->class[c]->styles[0] != NULL) {
       double maxsize,maxunscaledsize;
+      symbolObj *symbol;
       styleObj *style = layer->class[c]->styles[0];
       if (style->symbol >= map->symbolset.numsymbols) {
           msSetError(MS_SYMERR, "Invalid symbol index: %d", "msDrawShape()", style->symbol);
           return MS_FAILURE;
       }
-      symbolObj *symbol = map->symbolset.symbol[style->symbol];
+      symbol = map->symbolset.symbol[style->symbol];
       if(symbol->type == MS_SYMBOL_PIXMAP) {
     	  if(MS_SUCCESS != msPreloadImageSymbol(MS_MAP_RENDERER(map),symbol))
     		  return MS_FAILURE;

Modified: trunk/mapserver/mapwcs20.c
===================================================================
--- trunk/mapserver/mapwcs20.c	2010-12-22 05:04:34 UTC (rev 10812)
+++ trunk/mapserver/mapwcs20.c	2010-12-22 19:07:34 UTC (rev 10813)
@@ -2432,8 +2432,8 @@
 
 static int msWCSClearCoverageMetadata20(wcs20coverageMetadataObj *cm)
 {
+    int i = 0, j = 0;
     msFree(cm->native_format);
-    int i = 0, j = 0;
     for(i = 0; i < cm->numnilvalues; ++i)
     {
         msFree(cm->nilvalues[i]);