sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simplify expression handling in marker_helpers

Browse source
This commit is contained in:
Dane Springmeyer 2014-08-25 14:51:22 -07:00
parent feffa8f53c
commit 70f71790fe
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/mapnik/marker_helpers.hpp
View file

@ -413,16 +413,8 @@ void setup_transform_scaling(agg::trans_affine & tr,
attributes const& vars,
T const& sym)
{
double width = 0;
double height = 0;
expression_ptr width_expr = get<expression_ptr>(sym, keys::width);
if (width_expr)
width = util::apply_visitor(evaluate<feature_impl,value_type,attributes>(feature,vars), *width_expr).to_double();
expression_ptr height_expr = get<expression_ptr>(sym, keys::height);
if (height_expr)
height = util::apply_visitor(evaluate<feature_impl,value_type,attributes>(feature,vars), *height_expr).to_double();
double width = get<double>(sym, keys::width, feature, vars, 0);
double height = get<double>(sym, keys::height, feature, vars, 0);
if (width > 0 && height > 0)
{