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

svg_parse_value - add 'px' unit, report trailing garbage

Browse source 
- avoid operator comma in semantic action, refs #3249
This commit is contained in:
Mickey Rose 2016-01-23 20:44:14 +01:00
parent 05b66fc355
commit 8d7fca3236
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/svg/svg_parser.cpp
View file

@ -137,29 +137,36 @@ double parse_double(T & error_messages, const char* str)
template <typename T, int DPI = 90> template <typename T, int DPI = 90>
double parse_svg_value(T & error_messages, const char* str, bool & percent) double parse_svg_value(T & error_messages, const char* str, bool & percent)
{ {
using namespace boost::spirit::qi;
using skip_type = boost::spirit::ascii::space_type; using skip_type = boost::spirit::ascii::space_type;
using boost::phoenix::ref; using boost::phoenix::ref;
double_type double_; qi::double_type double_;
char_type char_; qi::lit_type lit;
_1_type _1; qi::_1_type _1;
double val = 0.0; double val = 0.0;
symbols<char, double> units; qi::symbols<char, double> units;
units.add units.add
("px", 1.0)
("pt", DPI/72.0) ("pt", DPI/72.0)
("pc", DPI/6.0) ("pc", DPI/6.0)
("mm", DPI/25.4) ("mm", DPI/25.4)
("cm", DPI/2.54) ("cm", DPI/2.54)
("in", (double)DPI) ("in", (double)DPI)
; ;
if (!phrase_parse(str, str + std::strlen(str), const char* cur = str; // phrase_parse modifies the first iterator
double_[ref(val) = _1, ref(percent) = false] const char* end = str + std::strlen(str);
if (!qi::phrase_parse(cur, end,
double_[ref(val) = _1][ref(percent) = false]
> - (units[ ref(val) *= _1] > - (units[ ref(val) *= _1]
| |
char_('%')[ref(val) *= 0.01, ref(percent) = true]), lit('%')[ref(val) *= 0.01][ref(percent) = true]),
skip_type())) skip_type()))
{ {
error_messages.emplace_back("Failed to parse SVG value: \"" + std::string(str) + "\""); error_messages.emplace_back("Failed to parse SVG value: '" + std::string(str) + "'");
}
else if (cur != end)
{
error_messages.emplace_back("Failed to parse SVG value: '" + std::string(str) +
"', trailing garbage: '" + cur + "'");
} }
return val; return val;
} }