pool/mapserver
SHA256
11
0
Fork 2
Code Issues Pull Requests Activity

Reworked the patch a little

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=76
This commit is contained in:
Bjoern Schilberg
2011-05-31 06:31:04 +00:00
committed by Git OBS Bridge
parent 4ba5dc79e7
commit 4434f6e4d6
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
patch_3877-r11714.patch
View File

@@ -1,6 +1,15 @@
diff -urNad mapserver-6.0.0~/mapunion.c mapserver-6.0.0/mapunion.c diff -urNad mapserver-6.0.0~/mapunion.c mapserver-6.0.0/mapunion.c
--- mapserver-6.0.0/mapunion.c (revision 11709) --- mapserver-6.0.0/mapunion.c (revision 11709)
+++ mapserver-6.0.0/mapunion.c (revision 11714) +++ mapserver-6.0.0/mapunion.c (revision 11714)
@@ -236,7 +236,7 @@
}
/* clean up expression tokens */
-void msUnionLayerFreeExpressionTokens(layerObj *layer)
+int msUnionLayerFreeExpressionTokens(layerObj *layer)
{
int i,j;
freeExpressionTokens(&(layer->filter));
@@ -316,5 +316,5 @@ @@ -316,5 +316,5 @@
/* get items requested by the union layer plus the required items */ /* get items requested by the union layer plus the required items */
msLayerSetProcessingKey(srclayer, "ITEMS", itemlist); msLayerSetProcessingKey(srclayer, "ITEMS", itemlist);