Skip to content

Commit

Permalink
Fix regression related to sld expression (#3929)
Browse files Browse the repository at this point in the history
  • Loading branch information
Alan Boudreault committed Aug 21, 2012
1 parent 91841b1 commit 67365bc
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions mapogcsld.c
Expand Up @@ -795,7 +795,6 @@ int msSLDParseNamedLayer(CPLXMLNode *psRoot, layerObj *psLayer)

if (psNode) {
char *pszExpression = NULL;
char *pszEscapedExpression = NULL;
int i;

/*preparse the filter for possible gml aliases set on the layer's metada:
Expand Down Expand Up @@ -834,18 +833,15 @@ int msSLDParseNamedLayer(CPLXMLNode *psRoot, layerObj *psLayer)
psNode = NULL;

if (pszExpression) {
pszEscapedExpression = msStringEscape(pszExpression);
nNewClasses =
nClassAfterFilter - nClassBeforeFilter;
for (i=0; i<nNewClasses; i++) {
msLoadExpressionString(&psLayer->
class[psLayer->numclasses-1-i]->
expression, pszEscapedExpression);
expression, pszExpression);
}
msFree(pszExpression);
pszExpression = NULL;
msFree(pszEscapedExpression);
pszEscapedExpression = NULL;
}

}
Expand Down

0 comments on commit 67365bc

Please sign in to comment.