jengelh/mapserver
SHA256
1
0
Fork 0
forked from pool/mapserver
Code Pull Requests Activity

Reworked the patch a little again

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

45
patch_3877-r11714.patch
View File

@ -1,33 +1,12 @@
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 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 @@
/* get items requested by the union layer plus the required items */
msLayerSetProcessingKey(srclayer, "ITEMS", itemlist);
- if (msLayerWhichItems(srclayer, TRUE, NULL) != MS_SUCCESS)
+ if (msLayerWhichItems(srclayer, MS_TRUE, NULL) != MS_SUCCESS)
{
msFree(itemlist);
@@ -325,5 +325,5 @@
{
/* get only the required items */
- if (msLayerWhichItems(srclayer, FALSE, NULL) != MS_SUCCESS)
+ if (msLayerWhichItems(srclayer, MS_FALSE, NULL) != MS_SUCCESS)
return MS_FAILURE;
}
@@ -354,5 +354,5 @@
/* get only the required items */
- if (msLayerWhichItems(srclayer, FALSE, NULL) != MS_SUCCESS)
+ if (msLayerWhichItems(srclayer, MS_FALSE, NULL) != MS_SUCCESS)
return MS_FAILURE;
}
diff -urNad a/mapunion.c a/mapunion.c.orig
--- a/mapunion.c 2011-05-31 08:51:45.691271866 +0200
+++ a/mapunion.c.orig 2011-05-31 08:51:35.083376517 +0200
@@ -236,7 +236,7 @@
}
/* clean up expression tokens */
-void msUnionLayerFreeExpressionTokens(layerObj *layer)
+int msUnionLayerFreeExpressionTokens(layerObj *layer)
{
int i,j;
freeExpressionTokens(&(layer->filter));