Skip to content

Commit

Permalink
Fix regression with rfc14 (#4676)
Browse files Browse the repository at this point in the history
  • Loading branch information
Alan Boudreault committed Jul 2, 2013
1 parent 14758bb commit 3745e3c
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion maplayer.c
Original file line number Diff line number Diff line change
Expand Up @@ -1655,6 +1655,7 @@ int msInitializeVirtualTable(layerObj *layer)

typedef struct {
rectObj searchrect;
int is_relative; /* relative coordinates? */
}
msINLINELayerInfo;

Expand All @@ -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;
}

Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 3745e3c

Please sign in to comment.