[mapserver-commits] r11639 - trunk/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2011-05-03 13:14:12 -0700 (Tue, 03 May 2011)
New Revision: 11639

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapunion.c
Log:
Fixed msUnionLayerNextShape to return correct values (#3859)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-05-03 16:20:21 UTC (rev 11638)
+++ trunk/mapserver/HISTORY.TXT	2011-05-03 20:14:12 UTC (rev 11639)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk): 
 ---------------------------- 
 
+- Fixed msUnionLayerNextShape to return correct values (#3859)  
+
 - Union layer: fix for the failure if one or more of the source layers 
   are not in the current extent (#3858)
 

Modified: trunk/mapserver/mapunion.c
===================================================================
--- trunk/mapserver/mapunion.c	2011-05-03 16:20:21 UTC (rev 11638)
+++ trunk/mapserver/mapunion.c	2011-05-03 20:14:12 UTC (rev 11639)
@@ -405,7 +405,7 @@
         if (layerinfo->status[layerinfo->layerIndex] == MS_SUCCESS)
         {
             srclayer = &layerinfo->layers[layerinfo->layerIndex];
-            while (srclayer->vtable->LayerNextShape(srclayer, shape) == MS_SUCCESS)
+            while ((rv = srclayer->vtable->LayerNextShape(srclayer, shape)) == MS_SUCCESS)
             {
                 if(layer->styleitem) 
                 {