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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Artem Pavlenko 2012-06-18 18:52:06 -04:00
commit a01e1b3b14
6 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/agg/process_line_pattern_symbolizer.cpp
View file

@ -57,7 +57,7 @@ void agg_renderer<T>::process(line_pattern_symbolizer const& sym,
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::comp_op_adaptor_rgba_pre<color, order> blender_type;
typedef agg::pattern_filter_bilinear_rgba8 pattern_filter_type;
typedef agg::line_image_pattern<pattern_filter_type> pattern_type;
typedef agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_type;

6
src/agg/process_line_symbolizer.cpp
View file

@ -69,7 +69,7 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
typedef agg::rgba8 color_type;
typedef agg::order_rgba order_type;
typedef agg::pixel32_type pixel_type;
typedef agg::comp_op_adaptor_rgba<color_type, order_type> blender_type; // comp blender
typedef agg::comp_op_adaptor_rgba_pre<color_type, order_type> blender_type; // comp blender
typedef agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_comp_type;
typedef agg::renderer_base<pixfmt_comp_type> renderer_base;
@ -89,7 +89,7 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
double scaled = scale_factor_ * .5;
agg::line_profile_aa profile(stroke_.get_width() * scaled, agg::gamma_power(stroke_.get_gamma()));
renderer_type ren(renb, profile);
ren.color(agg::rgba8(r, g, b, int(a*stroke_.get_opacity())));
ren.color(agg::rgba8_pre(r, g, b, int(a*stroke_.get_opacity())));
rasterizer_type ras(ren);
set_join_caps_aa(stroke_,ras);
@ -141,7 +141,7 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
pixf.comp_op(static_cast<agg::comp_op_e>(sym.comp_op()));
renderer_base renb(pixf);
renderer_type ren(renb);
ren.color(agg::rgba8(r, g, b, int(a * stroke_.get_opacity())));
ren.color(agg::rgba8_pre(r, g, b, int(a * stroke_.get_opacity())));
agg::scanline_u8 sl;
agg::render_scanlines(*ras_ptr, sl, ren);
}

10
src/agg/process_markers_symbolizer.cpp
View file

@ -58,7 +58,7 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
typedef agg::rgba8 color_type;
typedef agg::order_rgba order_type;
typedef agg::pixel32_type pixel_type;
typedef agg::comp_op_adaptor_rgba<color_type, order_type> blender_type; // comp blender
typedef agg::comp_op_adaptor_rgba_pre<color_type, order_type> blender_type; // comp blender
typedef agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_comp_type;
typedef agg::renderer_base<pixfmt_comp_type> renderer_base;
typedef agg::renderer_scanline_aa_solid<renderer_base> renderer_type;
@ -256,7 +256,7 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
agg::ellipse c(x, y, rx, ry);
marker.concat_path(c);
ras_ptr->add_path(marker);
ren.color(agg::rgba8(r, g, b, int(a*sym.get_opacity())));
ren.color(agg::rgba8_pre(r, g, b, int(a*sym.get_opacity())));
// TODO - fill with packed scanlines? agg::scanline_p8
// and agg::renderer_outline_aa
agg::render_scanlines(*ras_ptr, sl, ren);
@ -269,7 +269,7 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
outline.generator().width(strk_width * scale_factor_);
ras_ptr->add_path(outline);
ren.color(agg::rgba8(s_r, s_g, s_b, int(s_a*stroke_.get_opacity())));
ren.color(agg::rgba8_pre(s_r, s_g, s_b, int(s_a*stroke_.get_opacity())));
agg::render_scanlines(*ras_ptr, sl_line, ren);
}
if (!sym.get_ignore_placement())
@ -326,7 +326,7 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
ras_ptr->add_path(trans);
// fill
ren.color(agg::rgba8(r, g, b, int(a*sym.get_opacity())));
ren.color(agg::rgba8_pre(r, g, b, int(a*sym.get_opacity())));
agg::render_scanlines(*ras_ptr, sl, ren);
// outline
@ -336,7 +336,7 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
agg::conv_stroke<agg::conv_transform<agg::path_storage, agg::trans_affine> > outline(trans);
outline.generator().width(strk_width * scale_factor_);
ras_ptr->add_path(outline);
ren.color(agg::rgba8(s_r, s_g, s_b, int(s_a*stroke_.get_opacity())));
ren.color(agg::rgba8_pre(s_r, s_g, s_b, int(s_a*stroke_.get_opacity())));
agg::render_scanlines(*ras_ptr, sl_line, ren);
}
}

2
src/agg/process_polygon_pattern_symbolizer.cpp
View file

@ -86,7 +86,7 @@ void agg_renderer<T>::process(polygon_pattern_symbolizer const& sym,
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::comp_op_adaptor_rgba_pre<color, order> blender_type;
typedef agg::wrap_mode_repeat wrap_x_type;
typedef agg::wrap_mode_repeat wrap_y_type;
typedef agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_type;

4
src/agg/process_polygon_symbolizer.cpp
View file

@ -82,7 +82,7 @@ void agg_renderer<T>::process(polygon_symbolizer const& sym,
typedef agg::rgba8 color_type;
typedef agg::order_rgba order_type;
typedef agg::pixel32_type pixel_type;
typedef agg::comp_op_adaptor_rgba<color_type, order_type> blender_type; // comp blender
typedef agg::comp_op_adaptor_rgba_pre<color_type, order_type> blender_type; // comp blender
typedef agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_comp_type;
typedef agg::renderer_base<pixfmt_comp_type> renderer_base;
typedef agg::renderer_scanline_aa_solid<renderer_base> renderer_type;
@ -90,7 +90,7 @@ void agg_renderer<T>::process(polygon_symbolizer const& sym,
pixf.comp_op(static_cast<agg::comp_op_e>(sym.comp_op()));
renderer_base renb(pixf);
renderer_type ren(renb);
ren.color(agg::rgba8(r, g, b, int(a * sym.get_opacity())));
ren.color(agg::rgba8_pre(r, g, b, int(a * sym.get_opacity())));
agg::scanline_u8 sl;
agg::render_scanlines(*ras_ptr, sl, ren);

2
src/image_compositing.cpp
View file

@ -98,7 +98,7 @@ void composite(T1 & dst, T2 & src, composite_mode_e mode,
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::comp_op_adaptor_rgba_pre<color, order> blender_type;
typedef agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_type;
typedef agg::renderer_base<pixfmt_type> renderer_type;