[mapserver-commits] r7941 - branches/branch-5-2/mapserver

[svn at osgeo.org]

Author: pramsey
Date: 2008-10-01 16:59:12 -0400 (Wed, 01 Oct 2008)
New Revision: 7941

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



Modified: branches/branch-5-2/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-2/mapserver/HISTORY.TXT	2008-10-01 20:58:57 UTC (rev 7940)
+++ branches/branch-5-2/mapserver/HISTORY.TXT	2008-10-01 20:59:12 UTC (rev 7941)
@@ -12,6 +12,9 @@
 
 Current Version (SVN branch-5-2)
 --------------------------------
+
+- tileindexed rasters when DATA is manipulated via mapscript work (#2783)
+
 - PHP: add priority attribute to the label object (#2782)
 
 - Fixed bug when QUERYMAP hilite color is set and the shape's color in a 

Modified: branches/branch-5-2/mapserver/mapraster.c
===================================================================
--- branches/branch-5-2/mapserver/mapraster.c	2008-10-01 20:58:57 UTC (rev 7940)
+++ branches/branch-5-2/mapserver/mapraster.c	2008-10-01 20:59:12 UTC (rev 7941)
@@ -1385,7 +1385,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);