[mapserver-commits] r12811 - trunk/mapserver

[svn at osgeo.org]

Author: rouault
Date: 2011-11-27 01:49:08 -0800 (Sun, 27 Nov 2011)
New Revision: 12811

Modified:
   trunk/mapserver/mapuvraster.c
Log:
Fix compilation with MSVC (#4094)

Modified: trunk/mapserver/mapuvraster.c
===================================================================
--- trunk/mapserver/mapuvraster.c	2011-11-27 09:48:34 UTC (rev 12810)
+++ trunk/mapserver/mapuvraster.c	2011-11-27 09:49:08 UTC (rev 12811)
@@ -87,6 +87,7 @@
 #ifdef USE_GDAL
   uvRasterLayerInfo *uvlinfo = (uvRasterLayerInfo *) layer->layerinfo;
   int   i;
+  int *itemindexes;
   
   if (layer->numitems == 0)
       return MS_SUCCESS;
@@ -107,11 +108,11 @@
     return(MS_FAILURE);
   }
 
-  int *itemindexes = (int*)layer->iteminfo;
+  itemindexes = (int*)layer->iteminfo;
   for(i=0;i<layer->numitems;i++) 
   {
-      // Special case for handling text string and angle coming from
-      // OGR style strings.  We use special attribute snames.
+      /* Special case for handling text string and angle coming from */
+      /* OGR style strings.  We use special attribute snames. */
       if (EQUAL(layer->items[i], MSUVRASTER_ANGLE))
           itemindexes[i] = MSUVRASTER_ANGLEINDEX;
       else if (EQUAL(layer->items[i], MSUVRASTER_LENGTH))
@@ -316,7 +317,7 @@
   if(layer->numitems == 0) 
       return(NULL);
 
-  if(!layer->iteminfo)  // Should not happen... but just in case!
+  if(!layer->iteminfo)  /* Should not happen... but just in case! */
       if (msUVRASTERLayerInitItemInfo(layer) != MS_SUCCESS)
           return NULL;