From 4549c0b63c3c4689040e9ace5b8551d00a021f4a Mon Sep 17 00:00:00 2001 From: Jiri Drbalek Date: Sat, 18 Oct 2014 10:29:21 +0000 Subject: [PATCH] ignore scale_factor for geometry-transform scale --- include/mapnik/transform_processor.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/mapnik/transform_processor.hpp b/include/mapnik/transform_processor.hpp index a9b9d5dd9..82d210c4e 100644 --- a/include/mapnik/transform_processor.hpp +++ b/include/mapnik/transform_processor.hpp @@ -114,10 +114,10 @@ struct transform_processor void operator() (matrix_node const& node) { - double a = eval(node.a_) * scale_factor_; // scale x; + double a = eval(node.a_); // scale x; double b = eval(node.b_); double c = eval(node.c_); - double d = eval(node.d_) * scale_factor_; // scale y; + double d = eval(node.d_); // scale y; double e = eval(node.e_) * scale_factor_; // translate x double f = eval(node.f_) * scale_factor_; // translate y transform_.multiply(agg::trans_affine(a, b, c, d, e, f)); @@ -132,8 +132,8 @@ struct transform_processor void operator() (scale_node const& node) { - double sx = eval(node.sx_) * scale_factor_; - double sy = eval(node.sy_, sx) * scale_factor_; + double sx = eval(node.sx_); + double sy = eval(node.sy_, sx); transform_.scale(sx, sy); }