[mapserver-commits] r9947 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2010-03-16 17:19:51 -0400 (Tue, 16 Mar 2010)
New Revision: 9947

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapraster.c
Log:
ensure that non-file raster datasets work (#3253)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-03-16 19:59:24 UTC (rev 9946)
+++ trunk/mapserver/HISTORY.TXT	2010-03-16 21:19:51 UTC (rev 9947)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Ensure that non-file raster datasets work (#3253) 
+
 - Correct mutex locking problem with rasters with no inherent georef. (#3368) 
 
 - PHP Mapscript refactoring: take full advantage of PHP 5 / Zend Engine 2 (#3278)"

Modified: trunk/mapserver/mapraster.c
===================================================================
--- trunk/mapserver/mapraster.c	2010-03-16 19:59:24 UTC (rev 9946)
+++ trunk/mapserver/mapraster.c	2010-03-16 21:19:51 UTC (rev 9947)
@@ -527,12 +527,12 @@
     ** If using a tileindex then build the path relative to that file if SHAPEPATH is not set.
     */
     if(layer->tileindex && !map->shapepath) { 
-      msBuildPath(tiAbsFilePath, map->mappath, layer->tileindex); /* absolute path to tileindex file */
+      msTryBuildPath(tiAbsFilePath, map->mappath, layer->tileindex); /* absolute path to tileindex file */
       tiAbsDirPath = msGetPath(tiAbsFilePath); /* tileindex file's directory */
       msBuildPath(szPath, tiAbsDirPath, filename); 
       free(tiAbsDirPath);
     } else {
-      msBuildPath3(szPath, map->mappath, map->shapepath, filename);
+      msTryBuildPath3(szPath, map->mappath, map->shapepath, filename);
     }
 
     msAcquireLock( TLOCK_GDAL );