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

SVG : refactor and simplify width/height+viewBox logic (https://www.w3.org/TR/SVG11/struct.html#SVGElement) + check font_sizes_ size before accesing last element

Browse source
This commit is contained in:
Artem Pavlenko 2021-04-15 15:38:59 +01:00
parent 0feabeb7e8
commit 654a3c1f9f
1 changed files with 80 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/svg/svg_parser.cpp
View file

@ -304,7 +304,7 @@ double parse_font_size(T & parser, char const* str)
{ {
parser.err_handler().on_error("SVG parse error: failed to parse <font-size> with value \"" + std::string(str) + "\""); parser.err_handler().on_error("SVG parse error: failed to parse <font-size> with value \"" + std::string(str) + "\"");
} }
parser.font_sizes_.back() = val; if (!parser.font_sizes_.empty()) parser.font_sizes_.back() = val;
return val; return val;
} }
@ -837,7 +837,7 @@ void parse_attr(svg_parser & parser, char const* name, char const* value )
break; break;
case "font-size"_case: case "font-size"_case:
{ {
double font_size = parse_font_size(parser, value); parse_font_size(parser, value);
break; break;
} }
default: default:
@ -872,9 +872,9 @@ void parse_attr(svg_parser & parser, rapidxml::xml_node<char> const* node)
void parse_dimensions(svg_parser & parser, rapidxml::xml_node<char> const* node) void parse_dimensions(svg_parser & parser, rapidxml::xml_node<char> const* node)
{ {
double width = 0; // https://www.w3.org/TR/SVG11/struct.html#SVGElement
double height = 0; double width = 1; // 100%
double aspect_ratio = 1; double height = 1; // 100%
viewbox vbox = {0, 0, 0, 0}; viewbox vbox = {0, 0, 0, 0};
bool has_percent_height = true; bool has_percent_height = true;
bool has_percent_width = true; bool has_percent_width = true;
@ -896,8 +896,12 @@ void parse_dimensions(svg_parser & parser, rapidxml::xml_node<char> const* node)
agg::trans_affine t{}; agg::trans_affine t{};
parser.vbox_ = vbox; parser.vbox_ = vbox;
parser.normalized_diagonal_ = std::sqrt(vbox.width * vbox.width + vbox.height * vbox.height)/std::sqrt(2.0); parser.normalized_diagonal_ = std::sqrt(vbox.width * vbox.width + vbox.height * vbox.height)/std::sqrt(2.0);
if (!has_percent_width && !has_percent_height)
{ if (has_percent_width) width = vbox.width * width;
else if (!width_attr || width == 0) width = vbox.width;
if (has_percent_height) height = vbox.height * height;
else if (!height_attr || height == 0) height = vbox.height;
if (width > 0 && height > 0 && vbox.width > 0 && vbox.height > 0) if (width > 0 && height > 0 && vbox.width > 0 && vbox.height > 0)
{ {
std::pair<unsigned,bool> preserve_aspect_ratio {xMidYMid, true}; std::pair<unsigned,bool> preserve_aspect_ratio {xMidYMid, true};
@ -956,25 +960,23 @@ void parse_dimensions(svg_parser & parser, rapidxml::xml_node<char> const* node)
break; break;
}; };
} }
}
if (has_percent_width && !has_percent_height)
{
aspect_ratio = vbox.width / vbox.height;
width = aspect_ratio * height;
}
else if (!has_percent_width && has_percent_height)
{
aspect_ratio = vbox.width/vbox.height;
height = height / aspect_ratio;
}
else if (has_percent_width && has_percent_height)
{
width = vbox.width;
height = vbox.height;
}
t = agg::trans_affine_translation(-vbox.x0, -vbox.y0) * t; t = agg::trans_affine_translation(-vbox.x0, -vbox.y0) * t;
parser.viewbox_tr_ = t; parser.viewbox_tr_ = t;
} }
else if (width == 0 || height == 0 || has_percent_width || has_percent_height)
{
std::stringstream ss;
ss << "SVG parse error: can't infer valid image dimensions from \" width:";
if (has_percent_width) ss << width * 100 << "%";
else ss << width;
ss << " height:";
if (has_percent_height) ss << height * 100 << "%";
else ss << height;
ss << "\"";
parser.err_handler().on_error(ss.str());
parser.path_.set_dimensions(0, 0);
return;
}
parser.path_.set_dimensions(width, height); parser.path_.set_dimensions(width, height);
} }