[mapserver-commits] r7940 - trunk/mapserver

[svn at osgeo.org]

Author: pramsey
Date: 2008-10-01 16:58:57 -0400 (Wed, 01 Oct 2008)
New Revision: 7940

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapraster.c
Log:
Make layer->data test a little more lenient (#2783)


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2008-10-01 09:11:30 UTC (rev 7939)
+++ trunk/mapserver/HISTORY.TXT	2008-10-01 20:58:57 UTC (rev 7940)
@@ -12,6 +12,8 @@
 Current Version (5.3-dev, SVN trunk):
 ------------------------------------
 
+- tileindexed rasters when DATA is manipulated via mapscript work (#2783)
+
 - styleObj width now supports attribute binding
 
 - RFC40 implementation: label text wrapping and alignment (#2383)

Modified: trunk/mapserver/mapraster.c
===================================================================
--- trunk/mapserver/mapraster.c	2008-10-01 09:11:30 UTC (rev 7939)
+++ trunk/mapserver/mapraster.c	2008-10-01 20:58:57 UTC (rev 7940)
@@ -1398,7 +1398,7 @@
 
       if(status == MS_DONE) break; /* no more tiles/images */
        
-      if(layer->data == NULL) /* assume whole filename is in attribute field */
+      if(layer->data == NULL || strlen(layer->data) == 0 ) /* assume whole filename is in attribute field */
           strcpy( tilename, tshp.values[tileitemindex] );
       else
           sprintf(tilename, "%s/%s", tshp.values[tileitemindex], layer->data);