Permalink
Browse files

Remove useless orig_tilesrs field in layerObj struct

1 parent e35978e commit 2f4cb71afcf7a586b995ad25927ed219e2805b76 @rouault rouault committed Jul 3, 2013
Showing with 0 additions and 15 deletions.
  1. +0 −14 maplayer.c
  2. +0 −1 mapserver.h
View
@@ -88,11 +88,6 @@ int msLayerRestoreFromScaletokens(layerObj *layer)
layer->tileitem = layer->orig_tileitem;
layer->orig_tileitem = NULL;
}
- if(layer->orig_tilesrs) {
- msFree(layer->tilesrs);
- layer->tilesrs = layer->orig_tilesrs;
- layer->orig_tilesrs = NULL;
- }
if(layer->orig_filter) {
msLoadExpressionString(&(layer->filter),layer->orig_filter);
msFree(layer->orig_filter);
@@ -156,15 +151,6 @@ int msLayerApplyScaletokens(layerObj *layer, double scale)
layer->tileitem = msStrdup(layer->tileitem);
layer->tileitem = msReplaceSubstring(layer->tileitem,st->name,ste->value);
}
- if(layer->tilesrs && strstr(layer->tilesrs,st->name)) {
- if(layer->debug >= MS_DEBUGLEVEL_DEBUG) {
- msDebug("replacing scaletoken (%s) with (%s) in layer->tilesrs (%s) for scale=%f\n",
- st->name,ste->value,layer->name,scale);
- }
- layer->orig_tilesrs = layer->tilesrs;
- layer->tilesrs = msStrdup(layer->tilesrs);
- layer->tilesrs = msReplaceSubstring(layer->tilesrs,st->name,ste->value);
- }
if(layer->filteritem && strstr(layer->filteritem,st->name)) {
if(layer->debug >= MS_DEBUGLEVEL_DEBUG) {
msDebug("replacing scaletoken (%s) with (%s) in layer->filteritem (%s) for scale=%f\n",
View
@@ -1511,7 +1511,6 @@ extern "C" {
char *orig_data;
char *orig_tileitem;
char *orig_tileindex;
- char *orig_tilesrs;
char *orig_filteritem;
char *orig_filter;
#endif

0 comments on commit 2f4cb71

Please sign in to comment.