diff --git a/include/mapnik/markers_placements/point.hpp b/include/mapnik/markers_placements/point.hpp index 48e80fb88..4329761c2 100644 --- a/include/mapnik/markers_placements/point.hpp +++ b/include/mapnik/markers_placements/point.hpp @@ -54,9 +54,6 @@ public: done_(false) { rewind(); - - coord2d center = size.center(); - tr_ = agg::trans_affine_translation(-center.x, -center.y) * tr_; } virtual ~markers_point_placement() {} @@ -103,8 +100,9 @@ public: } angle = 0; - - box2d box = perform_transform(angle, x, y); + agg::trans_affine matrix = tr_; + matrix.translate(x,y); + box2d box = size_ * matrix; if (!allow_overlap_ && !detector_.has_placement(box)) { diff --git a/tests/visual_tests/images/marker-symbolizer-expressions-all-256-256-1.0-agg-reference.png b/tests/visual_tests/images/marker-symbolizer-expressions-all-256-256-1.0-agg-reference.png index dc41b20e4..f0e5e4d79 100644 Binary files a/tests/visual_tests/images/marker-symbolizer-expressions-all-256-256-1.0-agg-reference.png and b/tests/visual_tests/images/marker-symbolizer-expressions-all-256-256-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/marker-symbolizer-expressions-all-256-256-1.0-cairo-reference.png b/tests/visual_tests/images/marker-symbolizer-expressions-all-256-256-1.0-cairo-reference.png index eb8cb98f1..f2a6107fd 100644 Binary files a/tests/visual_tests/images/marker-symbolizer-expressions-all-256-256-1.0-cairo-reference.png and b/tests/visual_tests/images/marker-symbolizer-expressions-all-256-256-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-symbolizer-expressions-all-256-256-2.0-agg-reference.png b/tests/visual_tests/images/marker-symbolizer-expressions-all-256-256-2.0-agg-reference.png index 635e3cf42..b17741690 100644 Binary files a/tests/visual_tests/images/marker-symbolizer-expressions-all-256-256-2.0-agg-reference.png and b/tests/visual_tests/images/marker-symbolizer-expressions-all-256-256-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/marker-symbolizer-expressions-all-256-256-2.0-cairo-reference.png b/tests/visual_tests/images/marker-symbolizer-expressions-all-256-256-2.0-cairo-reference.png index a16bd4114..be828193a 100644 Binary files a/tests/visual_tests/images/marker-symbolizer-expressions-all-256-256-2.0-cairo-reference.png and b/tests/visual_tests/images/marker-symbolizer-expressions-all-256-256-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/text-bug1533-600-600-2.0-agg-reference.png b/tests/visual_tests/images/text-bug1533-600-600-2.0-agg-reference.png index 086752e8d..bd82b7c8a 100644 Binary files a/tests/visual_tests/images/text-bug1533-600-600-2.0-agg-reference.png and b/tests/visual_tests/images/text-bug1533-600-600-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/text-bug1533-600-600-2.0-cairo-reference.png b/tests/visual_tests/images/text-bug1533-600-600-2.0-cairo-reference.png index 16d3c77c5..c67f99f19 100644 Binary files a/tests/visual_tests/images/text-bug1533-600-600-2.0-cairo-reference.png and b/tests/visual_tests/images/text-bug1533-600-600-2.0-cairo-reference.png differ