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

+ fix compositing

Browse source
This commit is contained in:
Artem Pavlenko 2012-05-07 12:15:25 +01:00
parent 4a9387ea44
commit 3607281018
1 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/agg/process_polygon_pattern_symbolizer.cpp
View file

@ -79,7 +79,7 @@ void agg_renderer<T>::process(polygon_pattern_symbolizer const& sym,
typedef coord_transform2<CoordTransform,clipped_geometry_type> path_type; typedef coord_transform2<CoordTransform,clipped_geometry_type> path_type;
agg::rendering_buffer buf(current_buffer_->raw_data(), width_, height_, width_ * 4); agg::rendering_buffer buf(current_buffer_->raw_data(), width_, height_, width_ * 4);
agg::pixfmt_rgba32_plain pixf(buf); //agg::pixfmt_rgba32_plain pixf(buf);
agg::scanline_u8 sl; agg::scanline_u8 sl;
ras_ptr->reset(); ras_ptr->reset();
@ -109,26 +109,31 @@ void agg_renderer<T>::process(polygon_pattern_symbolizer const& sym,
if (!pat) return; if (!pat) return;
typedef agg::rgba8 color;
typedef agg::order_rgba order;
typedef agg::pixel32_type pixel_type;
typedef agg::comp_op_adaptor_rgba<color, order> blender_type;
typedef agg::wrap_mode_repeat wrap_x_type; typedef agg::wrap_mode_repeat wrap_x_type;
typedef agg::wrap_mode_repeat wrap_y_type; typedef agg::wrap_mode_repeat wrap_y_type;
typedef agg::pixfmt_alpha_blend_rgba<agg::blender_rgba32, typedef agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_type;
agg::row_accessor<agg::int8u>, agg::pixel32_type> rendering_buffer; typedef agg::image_accessor_wrap<agg::pixfmt_rgba32,
typedef agg::image_accessor_wrap<rendering_buffer,
wrap_x_type, wrap_x_type,
wrap_y_type> img_source_type; wrap_y_type> img_source_type;
typedef agg::span_pattern_rgba<img_source_type> span_gen_type; typedef agg::span_pattern_rgba<img_source_type> span_gen_type;
typedef agg::renderer_base<agg::pixfmt_rgba32_plain> ren_base; typedef agg::renderer_base<pixfmt_type> ren_base;
typedef agg::renderer_scanline_aa<ren_base, typedef agg::renderer_scanline_aa<ren_base,
agg::span_allocator<agg::rgba8>, agg::span_allocator<agg::rgba8>,
span_gen_type> renderer_type; span_gen_type> renderer_type;
pixfmt_type pixf(buf);
if (sym.comp_op()) pixf.comp_op(static_cast<agg::comp_op_e>(*sym.comp_op()));
ren_base renb(pixf); ren_base renb(pixf);
unsigned w=(*pat)->width(); unsigned w=(*pat)->width();
unsigned h=(*pat)->height(); unsigned h=(*pat)->height();
agg::row_accessor<agg::int8u> pattern_rbuf((agg::int8u*)(*pat)->getBytes(),w,h,w*4); agg::rendering_buffer pattern_rbuf((agg::int8u*)(*pat)->getBytes(),w,h,w*4);
agg::span_allocator<agg::rgba8> sa; agg::pixfmt_rgba32 pixf_pattern(pattern_rbuf);
rendering_buffer pixf_pattern(pattern_rbuf);
pixf_pattern.for_each_pixel(multiplier<agg::rgba8,agg::order_rgba>()); pixf_pattern.for_each_pixel(multiplier<agg::rgba8,agg::order_rgba>());
img_source_type img_src(pixf_pattern); img_source_type img_src(pixf_pattern);
@ -154,11 +159,11 @@ void agg_renderer<T>::process(polygon_pattern_symbolizer const& sym,
} }
span_gen_type sg(img_src, offset_x, offset_y); span_gen_type sg(img_src, offset_x, offset_y);
agg::span_allocator<agg::rgba8> sa;
renderer_type rp(renb,sa, sg); renderer_type rp(renb,sa, sg);
//metawriter_with_properties writer = sym.get_metawriter(); box2d<double> inflated_extent = query_extent_ * 1.0;
box2d<double> inflated_extent = query_extent_ * 1.1;
typedef boost::mpl::vector<clip_poly_tag,transform_tag,smooth_tag> conv_types; typedef boost::mpl::vector<clip_poly_tag,transform_tag,smooth_tag> conv_types;
vertex_converter<box2d<double>,rasterizer,polygon_pattern_symbolizer, proj_transform, CoordTransform,conv_types> vertex_converter<box2d<double>,rasterizer,polygon_pattern_symbolizer, proj_transform, CoordTransform,conv_types>
converter(inflated_extent,*ras_ptr,sym,t_,prj_trans, scale_factor_); converter(inflated_extent,*ras_ptr,sym,t_,prj_trans, scale_factor_);