Permalink
Browse files

Reverted change of msStyleSetGeomTransform, not used anymore

  • Loading branch information...
1 parent 4701b0a commit e6b7a5f7ef5b24722c9aae5551ea715ab65b8f61 Alan Boudreault committed Feb 25, 2013
Showing with 15 additions and 15 deletions.
  1. +1 −1 mapfile.c
  2. +13 −13 mapgeomtransform.c
  3. +1 −1 mapserver.h
View
@@ -2705,7 +2705,7 @@ int loadStyle(styleObj *style)
int s;
if((s = getSymbol(2, MS_STRING, MS_EXPRESSION)) == -1) return(MS_FAILURE);
if(s == MS_STRING)
- msStyleSetGeomTransform(&style->_geomtransform, msyystring_buffer);
+ msStyleSetGeomTransform(style, msyystring_buffer);
else {
/* handle expression case here for the moment */
msFree(style->_geomtransform.string);
View
@@ -32,29 +32,29 @@
extern int yyparse(parseObj *p);
-void msStyleSetGeomTransform(expressionObj *g, char *transform)
+void msStyleSetGeomTransform(styleObj *s, char *transform)
{
- msFree(g->string);
- g->string = msStrdup(transform);
+ msFree(s->_geomtransform.string);
+ s->_geomtransform.string = msStrdup(transform);
if(!strncasecmp("start",transform,5)) {
- g->type = MS_GEOMTRANSFORM_START;
+ s->_geomtransform.type = MS_GEOMTRANSFORM_START;
} else if(!strncasecmp("end",transform,3)) {
- g->type = MS_GEOMTRANSFORM_END;
+ s->_geomtransform.type = MS_GEOMTRANSFORM_END;
} else if(!strncasecmp("vertices",transform,8)) {
- g->type = MS_GEOMTRANSFORM_VERTICES;
+ s->_geomtransform.type = MS_GEOMTRANSFORM_VERTICES;
} else if(!strncasecmp("bbox",transform,4)) {
- g->type = MS_GEOMTRANSFORM_BBOX;
+ s->_geomtransform.type = MS_GEOMTRANSFORM_BBOX;
} else if(!strncasecmp("labelpnt",transform,8)) {
- g->type = MS_GEOMTRANSFORM_LABELPOINT;
+ s->_geomtransform.type = MS_GEOMTRANSFORM_LABELPOINT;
} else if(!strncasecmp("labelpoly",transform,9)) {
- g->type = MS_GEOMTRANSFORM_LABELPOLY;
+ s->_geomtransform.type = MS_GEOMTRANSFORM_LABELPOLY;
} else if(!strncasecmp("centroid",transform,8)) {
- g->type = MS_GEOMTRANSFORM_CENTROID;
+ s->_geomtransform.type = MS_GEOMTRANSFORM_CENTROID;
} else {
- g->type = MS_GEOMTRANSFORM_NONE;
+ s->_geomtransform.type = MS_GEOMTRANSFORM_NONE;
msSetError(MS_MISCERR,"unknown transform expression","msSetGeomTransform()");
- msFree(g->string);
- g->string = NULL;
+ msFree(s->_geomtransform.string);
+ s->_geomtransform.string = NULL;
}
}
View
@@ -2660,7 +2660,7 @@ extern "C" {
};
MS_DLL_EXPORT int msDrawTransformedShape(mapObj *map, symbolSetObj *symbolset, imageObj *image, shapeObj *shape, styleObj *style, double scalefactor);
- MS_DLL_EXPORT void msStyleSetGeomTransform(expressionObj *e, char *transform);
+ MS_DLL_EXPORT void msStyleSetGeomTransform(styleObj *s, char *transform);
MS_DLL_EXPORT char *msStyleGetGeomTransform(styleObj *style);
MS_DLL_EXPORT int msGeomTransformShape(mapObj *map, layerObj *layer, shapeObj *shape);

0 comments on commit e6b7a5f

Please sign in to comment.