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

fix variable shadowing in placements_list.hpp

Browse source
This commit is contained in:
Dane Springmeyer 2014-05-05 10:44:59 -07:00
parent 15d3ceffc8
commit 439fc9f700
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/mapnik/text/placements_list.hpp
View file

@ -42,8 +42,8 @@ struct glyph_info;
struct glyph_position struct glyph_position
{ {
glyph_position(glyph_info const& glyph, pixel_position const& pos, rotation const& rot) glyph_position(glyph_info const& _glyph, pixel_position const& _pos, rotation const& _rot)
: glyph(&glyph), pos(pos), rot(rot) { } : glyph(&_glyph), pos(_pos), rot(_rot) { }
glyph_info const* glyph; glyph_info const* glyph;
pixel_position pos; pixel_position pos;
rotation rot; rotation rot;
@ -52,8 +52,8 @@ struct glyph_position
struct marker_info struct marker_info
{ {
marker_info() : marker(), transform() {} marker_info() : marker(), transform() {}
marker_info(marker_ptr marker, agg::trans_affine const& transform) : marker_info(marker_ptr _marker, agg::trans_affine const& _transform) :
marker(marker), transform(transform) {} marker(_marker), transform(_transform) {}
marker_ptr marker; marker_ptr marker;
agg::trans_affine transform; agg::trans_affine transform;
}; };