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

image_compositing - fix composite method signature to composite(T & dst, T const& src,...) via providing const_rendering_buffer adapter

Browse source
This commit is contained in:
artemp 2015-01-08 12:42:38 +01:00
parent 481b6b7958
commit 8db7f58e8f
2 changed files with 39 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/image_compositing.hpp
View file

@ -83,7 +83,7 @@ MAPNIK_DECL boost::optional<composite_mode_e> comp_op_from_string(std::string co
MAPNIK_DECL boost::optional<std::string> comp_op_to_string(composite_mode_e comp_op); MAPNIK_DECL boost::optional<std::string> comp_op_to_string(composite_mode_e comp_op);
template <typename T> template <typename T>
MAPNIK_DECL void composite(T & dst, T & src, MAPNIK_DECL void composite(T & dst, T const& src,
composite_mode_e mode, composite_mode_e mode,
float opacity=1, float opacity=1,
int dx=0, int dx=0,

51
src/image_compositing.cpp
View file

@ -122,8 +122,33 @@ For example, if you generate some pattern with AGG (premultiplied) and would lik
*/ */
namespace detail {
// non-mutable rendering_buffer implementation
template <typename T>
struct rendering_buffer
{
using image_data_type = T;
using pixel_type = typename image_data_type::pixel_type;
using row_data = agg::const_row_info<uint8_t>;
rendering_buffer(T const& data)
: data_(data) {}
uint8_t const* buf() const { return data_.getBytes(); }
unsigned width() const { return data_.width();}
unsigned height() const { return data_.height();}
int stride() const { return data_.width() * sizeof(pixel_type);}
uint8_t const* row_ptr(int, int y, unsigned) {return row_ptr(y);}
uint8_t const* row_ptr(int y) const { return reinterpret_cast<uint8_t const*>(data_.getRow(y)); }
row_data row (int y) const { return row_data(0, data_.width() - 1, row_ptr(y)); }
image_data_type const& data_;
};
}
template <> template <>
MAPNIK_DECL void composite(image_data_rgba8 & dst, image_data_rgba8 & src, composite_mode_e mode, MAPNIK_DECL void composite(image_data_rgba8 & dst, image_data_rgba8 const& src, composite_mode_e mode,
float opacity, float opacity,
int dx, int dx,
int dy, int dy,
@ -131,39 +156,39 @@ MAPNIK_DECL void composite(image_data_rgba8 & dst, image_data_rgba8 & src, compo
{ {
using color = agg::rgba8; using color = agg::rgba8;
using order = agg::order_rgba; using order = agg::order_rgba;
using const_rendering_buffer = detail::rendering_buffer<image_data_rgba8>;
using blender_type = agg::comp_op_adaptor_rgba_pre<color, order>; using blender_type = agg::comp_op_adaptor_rgba_pre<color, order>;
using pixfmt_type = agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer>; using pixfmt_type = agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer>;
using renderer_type = agg::renderer_base<pixfmt_type>; using renderer_type = agg::renderer_base<pixfmt_type>;
agg::rendering_buffer dst_buffer(dst.getBytes(),dst.width(),dst.height(),dst.width() * 4); agg::rendering_buffer dst_buffer(dst.getBytes(),dst.width(),dst.height(),dst.width() * 4);
agg::rendering_buffer src_buffer(src.getBytes(),src.width(),src.height(),src.width() * 4); const_rendering_buffer src_buffer(src);
pixfmt_type pixf(dst_buffer); pixfmt_type pixf(dst_buffer);
pixf.comp_op(static_cast<agg::comp_op_e>(mode)); pixf.comp_op(static_cast<agg::comp_op_e>(mode));
agg::pixfmt_alpha_blend_rgba<agg::blender_rgba32, const_rendering_buffer, agg::pixel32_type> pixf_mask(src_buffer);
agg::pixfmt_rgba32 pixf_mask(src_buffer);
if (premultiply_src) pixf_mask.premultiply(); if (premultiply_src) pixf_mask.premultiply();
renderer_type ren(pixf); renderer_type ren(pixf);
ren.blend_from(pixf_mask,0,dx,dy,unsigned(255*opacity)); ren.blend_from(pixf_mask,0,dx,dy,unsigned(255*opacity));
} }
template <> template <>
MAPNIK_DECL void composite(image_data_gray32f & dst, image_data_gray32f & src, composite_mode_e mode, MAPNIK_DECL void composite(image_data_gray32f & dst, image_data_gray32f const& src, composite_mode_e mode,
float opacity, float opacity,
int dx, int dx,
int dy, int dy,
bool premultiply_src) bool premultiply_src)
{ {
using pixfmt_type = agg::pixfmt_gray32; using const_rendering_buffer = detail::rendering_buffer<image_data_gray32f>;
using renderer_type = agg::renderer_base<pixfmt_type>; using src_pixfmt_type = agg::pixfmt_alpha_blend_gray<agg::blender_gray<agg::gray32>, const_rendering_buffer, 1, 0>;
using dst_pixfmt_type = agg::pixfmt_alpha_blend_gray<agg::blender_gray<agg::gray32>, agg::rendering_buffer, 1, 0>;
using renderer_type = agg::renderer_base<dst_pixfmt_type>;
agg::rendering_buffer dst_buffer(dst.getBytes(),dst.width(),dst.height(),dst.width()); agg::rendering_buffer dst_buffer(dst.getBytes(),dst.width(),dst.height(),dst.width());
agg::rendering_buffer src_buffer(src.getBytes(),src.width(),src.height(),src.width()); const_rendering_buffer src_buffer(src);
pixfmt_type pixf(dst_buffer); dst_pixfmt_type pixf(dst_buffer);
src_pixfmt_type pixf_mask(src_buffer);
agg::pixfmt_gray32 pixf_mask(src_buffer);
renderer_type ren(pixf); renderer_type ren(pixf);
ren.copy_from(pixf_mask,0,dx,dy);; ren.copy_from(pixf_mask,0,dx,dy);
} }
} }