[mapserver-commits] r9144 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2009-07-07 12:00:19 -0400 (Tue, 07 Jul 2009)
New Revision: 9144

Modified:
   trunk/mapserver/mapogcfilter.c
   trunk/mapserver/mapswf.c
Log:
Missed updating a few msLayerWhichItems() calls to the new signature.

Modified: trunk/mapserver/mapogcfilter.c
===================================================================
--- trunk/mapserver/mapogcfilter.c	2009-07-07 13:38:05 UTC (rev 9143)
+++ trunk/mapserver/mapogcfilter.c	2009-07-07 16:00:19 UTC (rev 9144)
@@ -615,7 +615,7 @@
         if((psLayer->labelminscaledenom != -1) && (map->scaledenom < psLayer->labelminscaledenom)) 
           annotate = MS_FALSE;
     }
-    status = msLayerWhichItems(psLayer, MS_TRUE, annotate, NULL);
+    status = msLayerWhichItems(psLayer, MS_FALSE, NULL);
     if (status != MS_SUCCESS) 
       return;
 

Modified: trunk/mapserver/mapswf.c
===================================================================
--- trunk/mapserver/mapswf.c	2009-07-07 13:38:05 UTC (rev 9143)
+++ trunk/mapserver/mapswf.c	2009-07-07 16:00:19 UTC (rev 9144)
@@ -2603,9 +2603,7 @@
             layerPtr->numitems <= 0)
         {
             msLayerOpen(layerPtr);
-            msLayerWhichItems(layerPtr, MS_TRUE, MS_FALSE, 
-                              msLookupHashTable(&(layerPtr->metadata), 
-                                                "SWFDUMPATTRIBUTES"));
+            msLayerWhichItems(layerPtr, MS_FALSE, msLookupHashTable(&(layerPtr->metadata), "SWFDUMPATTRIBUTES"));
             bLayerOpen = 1;
         }