[mapserver-commits] r11010 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2011-02-24 20:56:20 -0800 (Thu, 24 Feb 2011)
New Revision: 11010

Modified:
   trunk/mapserver/mapwcs.h
   trunk/mapserver/mapwcs20.c
Log:
Applied patch for #3687.

Modified: trunk/mapserver/mapwcs.h
===================================================================
--- trunk/mapserver/mapwcs.h	2011-02-25 04:53:48 UTC (rev 11009)
+++ trunk/mapserver/mapwcs.h	2011-02-25 04:56:20 UTC (rev 11010)
@@ -156,7 +156,7 @@
 typedef struct
 {
     char *name;         /* name of the axis */
-    long size;          /* pixelsize of the axis */
+    int size;           /* pixelsize of the axis */
     double resolution;  /* resolution of the axis */
     char *resolutionUOM; /* resolution units of measure */
     wcs20SubsetObjPtr subset;

Modified: trunk/mapserver/mapwcs20.c
===================================================================
--- trunk/mapserver/mapwcs20.c	2011-02-25 04:53:48 UTC (rev 11009)
+++ trunk/mapserver/mapwcs20.c	2011-02-25 04:56:20 UTC (rev 11010)
@@ -62,10 +62,10 @@
 /*      only if all characters could be parsed, MS_SUCCESS is returned. */
 /************************************************************************/
 
-static int msStringParseInteger(const char *string, long *dest)
+static int msStringParseInteger(const char *string, int *dest)
 {
     char *parse_check;
-    *dest = strtol(string, &parse_check, 0);
+    *dest = (int)strtol(string, &parse_check, 0);
     if(parse_check == string)
     {
         return MS_FAILURE;
@@ -562,7 +562,7 @@
     *outAxis = string;
 
     /* parse size value */
-    if(msStringParseInteger(number, (long int *)outSize) != MS_SUCCESS)
+    if(msStringParseInteger(number, outSize) != MS_SUCCESS)
     {
         msSetError(MS_WCSERR, "Parameter value '%s' is not a valid integer.",
                 "msWCSParseSize20()", number);