[mapserver-commits] r7760 - trunk/mapserver

[svn at osgeo.org]

Author: pramsey
Date: 2008-06-27 17:49:58 -0400 (Fri, 27 Jun 2008)
New Revision: 7760

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapraster.c
Log:
Fix for tiled rasters with relative shape paths defined, from dfurhy (#2369)



Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2008-06-27 15:54:39 UTC (rev 7759)
+++ trunk/mapserver/HISTORY.TXT	2008-06-27 21:49:58 UTC (rev 7760)
@@ -13,7 +13,10 @@
 ----------------------------
 - maputil.c: fix a bug for offset lines with agg, when the first segment 
   was horizontal (#2659)
+- mapraster.c: fix for tiled rasters with relative shape paths defined, 
+  from dfurhy (#2369)
 
+
 Version 5.2.0-beta3 (2008-06-26):
 ---------------------------------
 

Modified: trunk/mapserver/mapraster.c
===================================================================
--- trunk/mapserver/mapraster.c	2008-06-27 15:54:39 UTC (rev 7759)
+++ trunk/mapserver/mapraster.c	2008-06-27 21:49:58 UTC (rev 7760)
@@ -1414,10 +1414,10 @@
     /*
     ** If using a tileindex then build the path relative to that file if SHAPEPATH is not set.
     */
-    if(layer->tileindex) {
+    if(layer->tileindex && !map->shapepath) { 
       msBuildPath(tiAbsFilePath, map->mappath, layer->tileindex); /* absolute path to tileindex file */
       tiAbsDirPath = msGetPath(tiAbsFilePath); /* tileindex file's directory */
-      msBuildPath3(szPath, tiAbsDirPath, map->shapepath, filename);
+      msBuildPath(szPath, tiAbsDirPath, filename); 
       free(tiAbsDirPath);
     } else {
       msBuildPath3(szPath, map->mappath, map->shapepath, filename);