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

svg2png: use svgBBOX() to calculate output PNG dimensions when no valif width or height (or viewBox) is specified.

Browse source
This commit is contained in:
Artem Pavlenko 2020-02-05 15:06:11 +00:00
parent c69e467ad0
commit 0d693b151d
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
utils/svg2png/svg2png.cpp
View file

@ -74,7 +74,16 @@ struct main_marker_visitor
double opacity = 1; double opacity = 1;
double w, h; double w, h;
std::tie(w, h) = marker.dimensions(); std::tie(w, h) = marker.dimensions();
if (w == 0 || h == 0)
{
if (verbose_)
{
std::clog << "Invalid SVG dimensions: " << w << "," << h << " using svgBBOX()" << std::endl;
}
auto b = marker.bounding_box();
w = b.width();
h = b.height();
}
double svg_width = w * scale_factor_; double svg_width = w * scale_factor_;
double svg_height = h * scale_factor_; double svg_height = h * scale_factor_;
@ -83,9 +92,7 @@ struct main_marker_visitor
int output_height = static_cast<int>(std::round(svg_height)); int output_height = static_cast<int>(std::round(svg_height));
if (verbose_) if (verbose_)
{ {
std::clog << "Found width of '" << w << "' and height of '" << h << "'\n"; std::clog << "SVG width of '" << w << "' and height of '" << h << "'\n";
auto b = marker.bounding_box();
std::clog << "SVG BBOX:" << b << std::endl;
std::clog << "Output image dimensions:[" << output_width << "," << output_height << "]" << std::endl; std::clog << "Output image dimensions:[" << output_width << "," << output_height << "]" << std::endl;
} }
mapnik::image_rgba8 im(output_width, output_height, true, true); mapnik::image_rgba8 im(output_width, output_height, true, true);