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

use SVG viewport as bounding box

Browse source
This commit is contained in:
artemp 2017-06-21 17:31:07 +02:00 committed by Artem Pavlenko
parent 12d077ea0c
commit a6bc69359a
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
utils/svg2png/svg2png.cpp
View file

@ -69,11 +69,11 @@ struct main_marker_visitor
agg::scanline_u8 sl; agg::scanline_u8 sl;
double opacity = 1; double opacity = 1;
int w = marker.width(); double w = 0;//marker.width();
int h = marker.height(); double h = 0;//marker.height();
if (w == 0 || h == 0) if (w == 0 || h == 0)
{ {
// fallback to svg width/height or viewBox // fallback to svg width/height and/or viewBox
std::tie(w, h) = marker.dimensions(); std::tie(w, h) = marker.dimensions();
} }
if (verbose_) if (verbose_)
@ -81,17 +81,19 @@ struct main_marker_visitor
std::clog << "found width of '" << w << "' and height of '" << h << "'\n"; std::clog << "found width of '" << w << "' and height of '" << h << "'\n";
} }
// 10 pixel buffer to avoid edge clipping of 100% svg's // 10 pixel buffer to avoid edge clipping of 100% svg's
mapnik::image_rgba8 im(w+0,h+0); mapnik::image_rgba8 im(static_cast<int>(w + 0.5), static_cast<int>(h + 0.5));
agg::rendering_buffer buf(im.bytes(), im.width(), im.height(), im.row_size()); agg::rendering_buffer buf(im.bytes(), im.width(), im.height(), im.row_size());
pixfmt pixf(buf); pixfmt pixf(buf);
renderer_base renb(pixf); renderer_base renb(pixf);
mapnik::box2d<double> const& bbox = marker.get_data()->bounding_box(); //mapnik::box2d<double> const& bbox = marker.get_data()->bounding_box();
mapnik::box2d<double> const& bbox = {0, 0, w, h};
std::cerr << "BBOX:" << bbox << std::endl;
mapnik::coord<double,2> c = bbox.center(); mapnik::coord<double,2> c = bbox.center();
// center the svg marker on '0,0' // center the svg marker on '0,0'
agg::trans_affine mtx = agg::trans_affine_translation(-c.x,-c.y); agg::trans_affine mtx = {};//agg::trans_affine_translation(-c.x,-c.y);
// render the marker at the center of the marker box // render the marker at the center of the marker box
mtx.translate(0.5 * im.width(), 0.5 * im.height()); //mtx.translate(0.5 * im.width(), 0.5 * im.height());
mapnik::svg::vertex_stl_adapter<mapnik::svg::svg_path_storage> stl_storage(marker.get_data()->source()); mapnik::svg::vertex_stl_adapter<mapnik::svg::svg_path_storage> stl_storage(marker.get_data()->source());
mapnik::svg::svg_path_adapter svg_path(stl_storage); mapnik::svg::svg_path_adapter svg_path(stl_storage);