[mapserver-commits] r9945 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2010-03-16 15:57:28 -0400 (Tue, 16 Mar 2010)
New Revision: 9945

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapresample.c
Log:
fix double locking problems with ungeoreferenced rasters (#3368)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-03-16 18:29:36 UTC (rev 9944)
+++ trunk/mapserver/HISTORY.TXT	2010-03-16 19:57:28 UTC (rev 9945)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Correct mutex locking problem with rasters with no inherent georef. (#3368) 
+
 - PHP Mapscript refactoring: take full advantage of PHP 5 / Zend Engine 2 (#3278)"
 
 - Fixed msRemoveHashTable() to return the proper value on failure/success.

Modified: trunk/mapserver/mapresample.c
===================================================================
--- trunk/mapserver/mapresample.c	2010-03-16 18:29:36 UTC (rev 9944)
+++ trunk/mapserver/mapresample.c	2010-03-16 19:57:28 UTC (rev 9945)
@@ -1472,7 +1472,9 @@
 
     memcpy( adfDstGeoTransform, map->gt.geotransform, sizeof(double)*6 );
 
+    msReleaseLock( TLOCK_GDAL );
     msGetGDALGeoTransform( hDS, map, layer, adfSrcGeoTransform );
+    msAcquireLock( TLOCK_GDAL );
 
     nSrcXSize = GDALGetRasterXSize( hDS );
     nSrcYSize = GDALGetRasterYSize( hDS );