[mapserver-commits] r11633 - trunk/mapserver

[svn at osgeo.org]

Author: schpidi
Date: 2011-05-03 03:29:12 -0700 (Tue, 03 May 2011)
New Revision: 11633

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapresample.c
Log:
Fixing memory leak in msResampleGDALToMap() (#3857).


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-05-03 10:13:26 UTC (rev 11632)
+++ trunk/mapserver/HISTORY.TXT	2011-05-03 10:29:12 UTC (rev 11633)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk): 
 ---------------------------- 
 
+- Fix memory leak in msResampleGDALToMap() (#3857)
+
 - Fix missing initialization of default formats in WCS 1.x.
 
 - Fix maxoverlapangle when value is set to 0 (#3856)

Modified: trunk/mapserver/mapresample.c
===================================================================
--- trunk/mapserver/mapresample.c	2011-05-03 10:13:26 UTC (rev 11632)
+++ trunk/mapserver/mapresample.c	2011-05-03 10:29:12 UTC (rev 11633)
@@ -1459,9 +1459,9 @@
     else
         sDummyMap.cellsize = dfNominalCellSize;
 
-    nLoadImgXSize = (int) MAX(1,(sSrcExtent.maxx - sSrcExtent.minx) 
+    nLoadImgXSize = MAX(1, (int) (sSrcExtent.maxx - sSrcExtent.minx) 
                               * (dfNominalCellSize / sDummyMap.cellsize));
-    nLoadImgYSize = (int) MAX(1,(sSrcExtent.maxy - sSrcExtent.miny) 
+    nLoadImgYSize = MAX(1, (int) (sSrcExtent.maxy - sSrcExtent.miny) 
                               * (dfNominalCellSize / sDummyMap.cellsize));
         
     /*