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

use the current buffer in markers, building, shield, and line pattern symbolizers to ensure that style level opacity and compositing work - refs #1262 and #314

Browse source
This commit is contained in:
Dane Springmeyer 2012-06-21 15:19:45 -04:00
parent 9dbfb786a9
commit af519a41a2
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/agg/process_building_symbolizer.cpp
View file

@ -51,7 +51,7 @@ void agg_renderer<T>::process(building_symbolizer const& sym,
typedef agg::renderer_base<agg::pixfmt_rgba32> ren_base; typedef agg::renderer_base<agg::pixfmt_rgba32> ren_base;
typedef agg::renderer_scanline_aa_solid<ren_base> renderer; typedef agg::renderer_scanline_aa_solid<ren_base> renderer;
agg::rendering_buffer buf(pixmap_.raw_data(),width_,height_, width_ * 4); agg::rendering_buffer buf(current_buffer_->raw_data(),width_,height_, width_ * 4);
agg::pixfmt_rgba32 pixf(buf); agg::pixfmt_rgba32 pixf(buf);
ren_base renb(pixf); ren_base renb(pixf);

2
src/agg/process_line_pattern_symbolizer.cpp
View file

@ -83,7 +83,7 @@ void agg_renderer<T>::process(line_pattern_symbolizer const& sym,
box2d<double> ext = query_extent_ * 1.0; box2d<double> ext = query_extent_ * 1.0;
agg::rendering_buffer buf(pixmap_.raw_data(),width_,height_, width_ * 4); agg::rendering_buffer buf(current_buffer_->raw_data(),width_,height_, width_ * 4);
pixfmt_type pixf(buf); pixfmt_type pixf(buf);
pixf.comp_op(static_cast<agg::comp_op_e>(sym.comp_op())); pixf.comp_op(static_cast<agg::comp_op_e>(sym.comp_op()));
renderer_base ren_base(pixf); renderer_base ren_base(pixf);

2
src/agg/process_markers_symbolizer.cpp
View file

@ -67,7 +67,7 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
ras_ptr->gamma(agg::gamma_power()); ras_ptr->gamma(agg::gamma_power());
agg::scanline_u8 sl; agg::scanline_u8 sl;
agg::scanline_p8 sl_line; agg::scanline_p8 sl_line;
agg::rendering_buffer buf(pixmap_.raw_data(), width_, height_, width_ * 4); agg::rendering_buffer buf(current_buffer_->raw_data(), width_, height_, width_ * 4);
pixfmt_comp_type pixf(buf); pixfmt_comp_type pixf(buf);
pixf.comp_op(static_cast<agg::comp_op_e>(sym.comp_op())); pixf.comp_op(static_cast<agg::comp_op_e>(sym.comp_op()));
renderer_base renb(pixf); renderer_base renb(pixf);

2
src/agg/process_shield_symbolizer.cpp
View file

@ -46,7 +46,7 @@ void agg_renderer<T>::process(shield_symbolizer const& sym,
scale_factor_, scale_factor_,
t_, font_manager_, *detector_, query_extent_); t_, font_manager_, *detector_, query_extent_);
text_renderer<T> ren(pixmap_, font_manager_, *(font_manager_.get_stroker())); text_renderer<T> ren(*current_buffer_, font_manager_, *(font_manager_.get_stroker()));
while (helper.next()) { while (helper.next()) {
placements_type &placements = helper.placements(); placements_type &placements = helper.placements();