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

enforce geometry_type const by removing ``inline geometry_type& get_geometry(std::size_t index)``

Browse source
This commit is contained in:
artemp 2015-02-06 17:13:41 +01:00
parent e19fdad3a6
commit 0f22fb596b
3 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/mapnik/feature.hpp
View file

@ -219,11 +219,6 @@ public:
return geom_cont_[index];
}
inline geometry_type& get_geometry(std::size_t index)
{
return geom_cont_[index];
}
inline box2d<double> envelope() const
{
// TODO - cache this

2
include/mapnik/memory_featureset.hpp
View file

@ -79,7 +79,7 @@ public:
{
for (std::size_t i=0; i<(*pos_)->num_geometries();++i)
{
geometry_type & geom = (*pos_)->get_geometry(i);
geometry_type const& geom = (*pos_)->get_geometry(i);
if (bbox_.intersects(::mapnik::envelope(geom)))
{
return *pos_++;

2
src/memory_datasource.cpp
View file

@ -49,7 +49,7 @@ struct accumulate_extent
auto size = feat->num_geometries();
for (std::size_t i = 0; i < size; ++i)
{
geometry_type & geom = feat->get_geometry(i);
geometry_type const& geom = feat->get_geometry(i);
auto bbox = ::mapnik::envelope(geom);
if ( first_ )
{