[mapserver-commits] r9946 - branches/branch-5-6/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2010-03-16 15:59:24 -0400 (Tue, 16 Mar 2010)
New Revision: 9946

Modified:
   branches/branch-5-6/mapserver/HISTORY.TXT
   branches/branch-5-6/mapserver/mapresample.c
Log:
fix double locking problems with ungeoreferenced rasters (#3368)

Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2010-03-16 19:57:28 UTC (rev 9945)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2010-03-16 19:59:24 UTC (rev 9946)
@@ -15,6 +15,8 @@
 Current Version (SVN branch-5-6):
 --------------------------------
 
+- Correct mutex locking problem with rasters with no inherent georef. (#3368) 
+
 - Fixed problem with isValidItem vs OGR special attributes (#3356)
 
 - Support wrap character for SVG output (#3367)

Modified: branches/branch-5-6/mapserver/mapresample.c
===================================================================
--- branches/branch-5-6/mapserver/mapresample.c	2010-03-16 19:57:28 UTC (rev 9945)
+++ branches/branch-5-6/mapserver/mapresample.c	2010-03-16 19:59:24 UTC (rev 9946)
@@ -1361,7 +1361,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 );