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

Merge branch '2.3.x' of github.com:mapnik/mapnik

Browse source
This commit is contained in:
Dane Springmeyer 2013-11-07 18:16:10 -08:00
commit 5393978dd4
2 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
plugins/input/ogr/ogr_featureset.cpp
View file

@ -44,22 +44,6 @@ using mapnik::geometry_utils;
using mapnik::transcoder; using mapnik::transcoder;
using mapnik::feature_factory; using mapnik::feature_factory;
ogr_featureset::ogr_featureset(mapnik::context_ptr const & ctx,
OGRLayer & layer,
OGRGeometry & extent,
std::string const& encoding)
: ctx_(ctx),
layer_(layer),
layerdef_(layer.GetLayerDefn()),
tr_(new transcoder(encoding)),
fidcolumn_(layer_.GetFIDColumn ()),
count_(0)
{
layer_.SetSpatialFilter (&extent);
}
ogr_featureset::ogr_featureset(mapnik::context_ptr const& ctx, ogr_featureset::ogr_featureset(mapnik::context_ptr const& ctx,
OGRLayer & layer, OGRLayer & layer,
mapnik::box2d<double> const& extent, mapnik::box2d<double> const& extent,

5
plugins/input/ogr/ogr_featureset.hpp
View file

@ -38,11 +38,6 @@
class ogr_featureset : public mapnik::Featureset class ogr_featureset : public mapnik::Featureset
{ {
public: public:
ogr_featureset(mapnik::context_ptr const& ctx,
OGRLayer & layer,
OGRGeometry & extent,
std::string const& encoding);
ogr_featureset(mapnik::context_ptr const& ctx, ogr_featureset(mapnik::context_ptr const& ctx,
OGRLayer & layer, OGRLayer & layer,
mapnik::box2d<double> const& extent, mapnik::box2d<double> const& extent,