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

Merge branch 'master' of github.com:mapnik/mapnik

Browse source
This commit is contained in:
kunitoki 2012-04-08 04:01:34 +02:00
commit 7b59fec405
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
SConstruct
View file

@ -1432,7 +1432,8 @@ if not preconfigured:
# Add rdynamic to allow using statics between application and plugins # Add rdynamic to allow using statics between application and plugins
# http://stackoverflow.com/questions/8623657/multiple-instances-of-singleton-across-shared-libraries-on-linux # http://stackoverflow.com/questions/8623657/multiple-instances-of-singleton-across-shared-libraries-on-linux
env.MergeFlags('-rdynamic') if env['PLATFORM'] != 'Darwin':
env.MergeFlags('-rdynamic')
# Customizing the C++ compiler flags depending on: # Customizing the C++ compiler flags depending on:
# (1) the C++ compiler used; and # (1) the C++ compiler used; and

10
plugins/input/shape/dbfile.cpp
View file

@ -156,16 +156,18 @@ void dbf_file::add_attribute(int col, mapnik::transcoder const& tr, Feature & f)
double val = 0.0; double val = 0.0;
const char *itr = record_+fields_[col].offset_; const char *itr = record_+fields_[col].offset_;
const char *end = itr + fields_[col].length_; const char *end = itr + fields_[col].length_;
qi::phrase_parse(itr,end,double_,ascii::space,val); bool r = qi::phrase_parse(itr,end,double_,ascii::space,val);
f.put(name,val); if (r && (itr == end))
f.put(name,val);
} }
else else
{ {
int val = 0; int val = 0;
const char *itr = record_+fields_[col].offset_; const char *itr = record_+fields_[col].offset_;
const char *end = itr + fields_[col].length_; const char *end = itr + fields_[col].length_;
qi::phrase_parse(itr,end,int_,ascii::space,val); bool r = qi::phrase_parse(itr,end,int_,ascii::space,val);
f.put(name,val); if (r && (itr == end))
f.put(name,val);
} }
break; break;
} }

3
src/map.cpp
View file

@ -28,6 +28,7 @@
#include <mapnik/filter_featureset.hpp> #include <mapnik/filter_featureset.hpp>
#include <mapnik/hit_test_filter.hpp> #include <mapnik/hit_test_filter.hpp>
#include <mapnik/scale_denominator.hpp> #include <mapnik/scale_denominator.hpp>
#include <mapnik/config_error.hpp>
#include <mapnik/config.hpp> // for PROJ_ENVELOPE_POINTS #include <mapnik/config.hpp> // for PROJ_ENVELOPE_POINTS
// boost // boost
@ -444,7 +445,7 @@ void Map::zoom_all()
} }
catch (proj_init_error & ex) catch (proj_init_error & ex)
{ {
mapnik::log() << "map: proj_init_error=" << ex.what(); throw mapnik::config_error(std::string("Projection error during map.zoom_all: ") + ex.what());
} }
} }
} }