From 7b22d69932d25376b10484c7ba1533503f42f816 Mon Sep 17 00:00:00 2001 From: Hermann Kraus Date: Fri, 17 Feb 2012 00:59:20 +0100 Subject: [PATCH] Revert "+ fix shield/text positioning - we still need to floor both text and shield" floor is removed from position calculation now, resulting in better marker and text matching. Refs #1078. This reverts commit 009a1e45a75836385dd6318ac5cc9cc0d2b26c35. --- src/agg/process_shield_symbolizer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/agg/process_shield_symbolizer.cpp b/src/agg/process_shield_symbolizer.cpp index 266d83880..6dad62d7b 100644 --- a/src/agg/process_shield_symbolizer.cpp +++ b/src/agg/process_shield_symbolizer.cpp @@ -27,9 +27,9 @@ #include #include #include + #include -// stl -#include + // boost #include @@ -57,8 +57,8 @@ void agg_renderer::process(shield_symbolizer const& sym, std::pair marker_pos = helper.get_marker_position(placement->placements[ii]); render_marker(marker_pos.first, marker_pos.second, helper.get_marker(), helper.get_transform(), sym.get_opacity()); - double x = std::floor(placement->placements[ii].starting_x); - double y = std::floor(placement->placements[ii].starting_y); + double x = placement->placements[ii].starting_x; + double y = placement->placements[ii].starting_y; ren.prepare_glyphs(&(placement->placements[ii])); ren.render(x, y); }