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

Fix shield displacement for scale_factor != 1.

Browse source 
All visual AGG test pass.
This commit is contained in:
Hermann Kraus 2013-03-25 02:11:00 +01:00
parent f3cf17728b
commit 29009b14bb
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/text/placement_finder.cpp
View file

@ -473,9 +473,9 @@ bool placement_finder::collision(const box2d<double> &box) const
void placement_finder::set_marker(marker_info_ptr m, box2d<double> box, bool marker_unlocked, const pixel_position &marker_displacement) void placement_finder::set_marker(marker_info_ptr m, box2d<double> box, bool marker_unlocked, const pixel_position &marker_displacement)
{ {
marker_ = m; marker_ = m;
marker_box_ = box; marker_box_ = box * scale_factor_;
marker_displacement_ = marker_displacement * scale_factor_;
marker_unlocked_ = marker_unlocked; marker_unlocked_ = marker_unlocked;
marker_displacement_ = marker_displacement;
has_marker_ = true; has_marker_ = true;
} }
@ -485,7 +485,6 @@ bool placement_finder::add_marker(glyph_positions_ptr glyphs, const pixel_positi
pixel_position real_pos = (marker_unlocked_ ? pos : glyphs->get_base_point()) + marker_displacement_; pixel_position real_pos = (marker_unlocked_ ? pos : glyphs->get_base_point()) + marker_displacement_;
box2d<double> bbox = marker_box_; box2d<double> bbox = marker_box_;
bbox.move(real_pos.x, real_pos.y); bbox.move(real_pos.x, real_pos.y);
bbox *= scale_factor_;
glyphs->set_marker(marker_, real_pos); glyphs->set_marker(marker_, real_pos);
if (collision(bbox)) return false; if (collision(bbox)) return false;
detector_.insert(bbox); detector_.insert(bbox);