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

Merge commit 'c84d83a685ba0e201b055db5a7cee68afde05d64' into harfbuzz

Browse source 
Conflicts:
	src/cairo_renderer.cpp
This commit is contained in:
Hermann Kraus 2013-03-23 15:37:05 +01:00
commit 7fae143b58
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/cairo_renderer.cpp
View file

@ -628,21 +628,24 @@ void cairo_renderer_base::render_marker(pixel_position const& pos,
mapnik::svg_path_ptr vmarker = *marker.get_vector_data();
if (vmarker)
{
agg::trans_affine marker_tr = tr;
marker_tr *=agg::trans_affine_scaling(scale_factor_);
agg::pod_bvector<svg::path_attributes> const & attributes = vmarker->attributes();
render_vector_marker(context_, pos, *vmarker, attributes, tr, opacity, recenter);
render_vector_marker(context_, pos, *vmarker, attributes, marker_tr, opacity, recenter);
}
}
else if (marker.is_bitmap())
{
agg::trans_affine matrix = tr;
double width = (*marker.get_bitmap_data())->width();
double height = (*marker.get_bitmap_data())->height();
double cx = 0.5 * width;
double cy = 0.5 * height;
matrix *= agg::trans_affine_translation(
boost::math::iround(pos.x - cx),
boost::math::iround(pos.y - cy));
context_.add_image(matrix, **marker.get_bitmap_data(), opacity);
agg::trans_affine marker_tr;
marker_tr *= agg::trans_affine_translation(-cx,-cy);
marker_tr *= tr;
marker_tr *= agg::trans_affine_scaling(scale_factor_);
marker_tr *= agg::trans_affine_translation(pos.x,pos.y);
context_.add_image(marker_tr, **marker.get_bitmap_data(), opacity);
}
}
@ -688,7 +691,7 @@ void cairo_renderer_base::process(point_symbolizer const& sym,
double dx = 0.5 * (*marker)->width();
double dy = 0.5 * (*marker)->height();
agg::trans_affine tr = agg::trans_affine_scaling(scale_factor_);
agg::trans_affine tr;
evaluate_transform(tr, feature, sym.get_image_transform());
box2d<double> label_ext (-dx, -dy, dx, dy);
label_ext *= tr;
@ -727,13 +730,6 @@ void cairo_renderer_base::process(shield_symbolizer const& sym,
pixel_position(glyphs->marker()->marker->width(),
glyphs->marker()->marker->height());
double dx = 0.5 * glyphs->marker()->marker->width();
double dy = 0.5 * glyphs->marker()->marker->height();
agg::trans_affine marker_tr = agg::trans_affine_translation(-dx,-dy);
marker_tr *= agg::trans_affine_scaling(scale_factor_);
marker_tr *= agg::trans_affine_translation(dx, dy);
marker_tr *= glyphs->marker()->transform;
render_marker(pos,
*(glyphs->marker()->marker), glyphs->marker()->transform,
sym.get_opacity());