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

Fix boost parser for viewbox

Browse source
This commit is contained in:
jakepruitt 2015-09-23 13:59:14 -07:00
parent a787d20e36
commit 344c5ae844
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/svg/svg_parser.cpp
View file

@ -166,9 +166,9 @@ bool parse_double_list(T & error_messages, const char* str, double* list)
qi::double_type double_; qi::double_type double_;
qi::char_type char_; qi::char_type char_;
if (!parse(str, str + std::strlen(str), double_[ref(list[0])=_1] >> char_(' ') | char_(',') if (!parse(str, str + std::strlen(str), double_[ref(list[0])=_1] >> (char_(' ') | char_(','))
>> double_[ref(list[1])=_1] >> char_(' ') | char_(',') >> double_[ref(list[1])=_1] >> (char_(' ') | char_(','))
>> double_[ref(list[2])=_1] >> char_(' ') | char_(',') >> double_[ref(list[2])=_1] >> (char_(' ') | char_(','))
>> double_[ref(list[3])=_1])) >> double_[ref(list[3])=_1]))
{ {
error_messages.emplace_back("failed to parse list of doubles from " + std::string(str)); error_messages.emplace_back("failed to parse list of doubles from " + std::string(str));
@ -507,13 +507,6 @@ void parse_dimensions(svg_parser & parser, rapidxml::xml_node<char> const* node)
has_viewbox = parse_double_list(parser.error_messages_, viewbox_attr->value(), viewbox); has_viewbox = parse_double_list(parser.error_messages_, viewbox_attr->value(), viewbox);
} }
std::cout << "Width = " << width << std::endl;
std::cout << "Width has percent = " << has_percent_width << std::endl;
std::cout << "Height has percent = " << has_percent_height << std::endl;
std::cout << "Viewbox = " << viewbox[0] << "," << viewbox[1] << "," << viewbox[2] << "," << viewbox[3] << std::endl;
std::cout << "Viewbox exists = " << has_viewbox << std::endl;
if (has_percent_width && !has_percent_height && has_viewbox) if (has_percent_width && !has_percent_height && has_viewbox)
{ {
aspect_ratio = viewbox[2] / viewbox[3]; aspect_ratio = viewbox[2] / viewbox[3];