shape : make primitives parsers static + fix numeric parser to handle mapnik::value_integer (64-bit)

This commit is contained in:
artemp 2015-06-16 12:01:11 +02:00
parent 8bf82b717e
commit c428779e83

View file

@ -191,7 +191,7 @@ void dbf_file::add_attribute(int col, mapnik::transcoder const& tr, mapnik::feat
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_;
ascii::space_type space; ascii::space_type space;
qi::double_type double_; static qi::double_type double_;
if (qi::phrase_parse(itr,end,double_,space,val)) if (qi::phrase_parse(itr,end,double_,space,val))
{ {
f.put(name,val); f.put(name,val);
@ -203,8 +203,8 @@ void dbf_file::add_attribute(int col, mapnik::transcoder const& tr, mapnik::feat
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_;
ascii::space_type space; ascii::space_type space;
qi::int_type int_; static qi::int_parser<mapnik::value_integer,10,1,-1> numeric_parser;
if (qi::phrase_parse(itr,end,int_,space,val)) if (qi::phrase_parse(itr, end, numeric_parser, space, val))
{ {
f.put(name,val); f.put(name,val);
} }