Skip to content

Commit

Permalink
Revert "+ fix shield/text positioning - we still need to floor both t…
Browse files Browse the repository at this point in the history
…ext and shield"

floor is removed from position calculation now, resulting in better marker and text matching.
Refs mapnik#1078.

This reverts commit 009a1e4.
  • Loading branch information
herm committed Feb 16, 2012
1 parent 465a762 commit 7b22d69
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/agg/process_shield_symbolizer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
#include <mapnik/svg/svg_converter.hpp>
#include <mapnik/svg/svg_renderer.hpp>
#include <mapnik/svg/svg_path_adapter.hpp>

#include <mapnik/symbolizer_helpers.hpp>
// stl
#include <cmath>


// boost
#include <boost/make_shared.hpp>
Expand Down Expand Up @@ -57,8 +57,8 @@ void agg_renderer<T>::process(shield_symbolizer const& sym,
std::pair<int, int> 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);
}
Expand Down

0 comments on commit 7b22d69

Please sign in to comment.