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

correct null shapes processing - closes #573 (backport from 2077)

Browse source
This commit is contained in:
Dane Springmeyer 2010-07-26 02:16:38 +00:00
parent ea43202344
commit 1c74f2095f
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plugins/input/shape/shape_featureset.cpp
View file

@ -62,7 +62,7 @@ feature_ptr shape_featureset<filterT>::next()
using mapnik::point_impl;
std::streampos pos=shape_.shp().pos();
if (pos < std::streampos(file_length_ * 2))
if (!shape_.shp().is_eof())
{
shape_.move_to(pos);
int type=shape_.type();
@ -107,13 +107,15 @@ feature_ptr shape_featureset<filterT>::next()
{
while (!filter_.pass(shape_.current_extent()))
{
int reclen=shape_.reclength_;
if (!shape_.shp().is_eof())
{
long pos = shape_.shp().pos();
//std::cerr << pos << " " << reclen << std::endl;
shape_.move_to(pos + 2 * reclen - 36);
std::streampos pos = shape_.shp().pos();
if (shape_.type() != shape_io::shape_null)
{
pos += std::streampos(2 * shape_.reclength_ - 36);
}
shape_.move_to(pos);
}
else
{
return feature_ptr();

2
plugins/input/shape/shape_io.cpp
View file

@ -63,7 +63,7 @@ void shape_io::move_to (int pos)
type_ = shape_null;
}
if (type_ != shape_point && type_ != shape_pointm && type_ != shape_pointz)
if (type_!= shape_null && type_ != shape_point && type_ != shape_pointm && type_ != shape_pointz)
{
shp_.read_envelope(cur_extent_);
}