[mapserver-commits] r9456 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2009-10-14 12:38:07 -0400 (Wed, 14 Oct 2009)
New Revision: 9456

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maprasterquery.c
Log:
Fixed raster queries broken by RFC 52 changes. (#3166)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-10-14 04:42:49 UTC (rev 9455)
+++ trunk/mapserver/HISTORY.TXT	2009-10-14 16:38:07 UTC (rev 9456)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fixed raster queries (broken by RFC 52 changes) (#3166)
+
 - Fixed coordinate projection problem in some cases with WMS GetFeatureInfo
   output in GML2 format (#2989)
 

Modified: trunk/mapserver/maprasterquery.c
===================================================================
--- trunk/mapserver/maprasterquery.c	2009-10-14 04:42:49 UTC (rev 9455)
+++ trunk/mapserver/maprasterquery.c	2009-10-14 16:38:07 UTC (rev 9456)
@@ -34,8 +34,8 @@
 
 MS_CVSID("$Id$")
 
-int msRASTERLayerGetShape(layerObj *layer, shapeObj *shape, int tile, 
-                          long record);
+int msRASTERLayerGetShape(layerObj *layer, shapeObj *shape, int tile, long record);
+int msRASTERLayerGetItems(layerObj *layer);
 
 #ifdef USE_GDAL
 
@@ -865,6 +865,9 @@
     if( status == MS_FAILURE || rlinfo->query_results == 0 )
         msRasterLayerInfoFree( layer );
 
+    /* populate the items/numitems layer-level values */
+    msRASTERLayerGetItems(layer);
+
     return status;
 #endif /* def USE_GDAL */
 }