Permalink
Browse files

Fix regression with rfc14 (#4676)

  • Loading branch information...
1 parent 14758bb commit 3745e3c6f959e1da18c15a2b8434f6a00d0ff4b7 Alan Boudreault committed Jul 2, 2013
Showing with 4 additions and 1 deletion.
  1. +4 −1 maplayer.c
View
@@ -1655,6 +1655,7 @@ int msInitializeVirtualTable(layerObj *layer)
typedef struct {
rectObj searchrect;
+ int is_relative; /* relative coordinates? */
}
msINLINELayerInfo;
@@ -1670,6 +1671,7 @@ msINLINELayerInfo *msINLINECreateLayerInfo(void)
{
msINLINELayerInfo *layerinfo = msSmallMalloc(sizeof(msINLINELayerInfo));
layerinfo->searchrect = (rectObj){-1.0,-1.0,-1.0,-1.0};
+ layerinfo->is_relative = MS_FALSE;
return layerinfo;
}
@@ -1712,6 +1714,7 @@ int msINLINELayerWhichShapes(layerObj *layer, rectObj rect, int isQuery)
layerinfo = (msINLINELayerInfo*) layer->layerinfo;
layerinfo->searchrect = rect;
+ layerinfo->is_relative = (layer->transform != MS_FALSE && layer->transform != MS_TRUE);
return MS_SUCCESS;
}
@@ -1766,7 +1769,7 @@ int msINLINELayerNextShape(layerObj *layer, shapeObj *shape)
layer->currentfeature = layer->currentfeature->next;
msComputeBounds(s);
- if (msRectOverlap(&s->bounds, &layerinfo->searchrect)) {
+ if (layerinfo->is_relative || msRectOverlap(&s->bounds, &layerinfo->searchrect)) {
msCopyShape(s, shape);

0 comments on commit 3745e3c

Please sign in to comment.