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

Slight fixes after merge

Browse source
This commit is contained in:
Blake Thompson 2015-04-15 16:05:56 -05:00
parent 7a50bb5214
commit a19da799e0
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/mapnik/vertex_adapters.hpp
View file

@ -181,10 +181,11 @@ private:
mutable bool start_loop_;
};
template <typename T>
struct ring_vertex_adapter
{
using value_type = typename point::value_type;
ring_vertex_adapter(linear_ring const& ring)
using value_type = typename point<T>::value_type;
ring_vertex_adapter(linear_ring<T> const& ring)
: ring_(ring),
current_index_(0),
end_index_(ring_.size()),
@ -226,7 +227,7 @@ struct ring_vertex_adapter
}
private:
linear_ring const& ring_;
linear_ring<T> const& ring_;
mutable std::size_t current_index_;
mutable std::size_t end_index_;
mutable bool start_loop_;

2
tests/cxx/vertex_adapter.cpp
View file

@ -99,7 +99,7 @@ SECTION("polygon with hole") {
REQUIRE( y == 0 );
// exterior ring via ring_vertex_adapter
mapnik::geometry::ring_vertex_adapter va2(g.exterior_ring);
mapnik::geometry::ring_vertex_adapter<double> va2(g.exterior_ring);
cmd = va2.vertex(&x,&y);
REQUIRE( cmd == mapnik::SEG_MOVETO );
REQUIRE( x == 0 );