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

+ rename vertex() back to get_vertex() to avoid g++ getting confused

Browse source
This commit is contained in:
artemp 2012-07-19 17:10:27 +01:00
parent aee38935ac
commit 4625e509b4
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mapnik/geometry.hpp
View file

@ -123,12 +123,12 @@ public:
unsigned vertex(double* x, double* y) const
{
return cont_.vertex(itr_++,x,y);
return cont_.get_vertex(itr_++,x,y);
}
unsigned vertex(std::size_t index, double* x, double* y) const
{
return cont_.vertex(index, x, y);
return cont_.get_vertex(index, x, y);
}
void rewind(unsigned ) const

2
include/mapnik/util/vertex_iterator.hpp
View file

@ -63,7 +63,7 @@ namespace mapnik { namespace util {
void increment()
{
boost::get<0>(v_) = vertices_->vertex(pos_++, &boost::get<1>(v_), &boost::get<2>(v_));
boost::get<0>(v_) = vertices_->get_vertex(pos_++, &boost::get<1>(v_), &boost::get<2>(v_));
}
bool equal( vertex_iterator const& other) const

2
include/mapnik/vertex_vector.hpp
View file

@ -105,7 +105,7 @@ public:
*vertex = y;
++pos_;
}
unsigned vertex(unsigned pos,coord_type* x,coord_type* y) const
unsigned get_vertex(unsigned pos,coord_type* x,coord_type* y) const
{
if (pos >= pos_) return SEG_END;
unsigned block = pos >> block_shift;