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

+ boost::bimap based enum<->string lookup table

Browse source 
+ fix pixel_format bgra -> rgba
This commit is contained in:
Artem Pavlenko 2012-03-21 15:45:23 +00:00
parent f78305428a
commit aefa23fb5b
2 changed files with 53 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/mapnik/image_compositing.hpp
View file

@ -23,7 +23,8 @@
#ifndef MAPNIK_IMAGE_COMPOSITING_HPP
#define MAPNIK_IMAGE_COMPOSITING_HPP
// agg
// stl
#include <string>
namespace mapnik
{
@ -33,7 +34,7 @@ namespace mapnik
enum composite_mode_e
{
clear = 1,
clear = 0,
src,
dst,
src_over,
@ -63,6 +64,8 @@ enum composite_mode_e
invert_rgb
};
composite_mode_e comp_op_from_string(std::string const& name);
template <typename T1, typename T2>
void composite(T1 & im, T2 & im2, composite_mode_e mode);

138
src/image_compositing.cpp
View file

@ -24,6 +24,10 @@
#include <mapnik/image_compositing.hpp>
#include <mapnik/image_data.hpp>
// boost
#include <boost/assign/list_of.hpp>
#include <boost/bimap.hpp>
// agg
#include "agg_rendering_buffer.h"
#include "agg_rasterizer_scanline_aa.h"
@ -31,15 +35,55 @@
#include "agg_renderer_scanline.h"
#include "agg_pixfmt_rgba.h"
namespace mapnik
{
typedef boost::bimap<composite_mode_e, std::string> comp_op_lookup_type;
static const comp_op_lookup_type comp_lookup = boost::assign::list_of<comp_op_lookup_type::relation>
(clear,"clear")
(src,"src")
(dst,"dst")
(src_over,"dst")
(dst_over,"dst_over")
(src_in,"src_in")
(dst_in,"dst_in")
(src_out,"src_out")
(dst_out,"dst_out")
(src_atop,"src_atop")
(dst_atop,"dst_atop")
(_xor,"xor")
(plus,"plus")
(minus,"minus")
(multiply,"multiply")
(screen,"screen")
(overlay,"overlay")
(darken,"darken")
(lighten,"lighten")
(color_dodge,"color_dodge")
(color_burn,"color_burn")
(hard_light,"hard_light")
(soft_light,"soft_light")
(difference,"difference")
(exclusion,"exclusion")
(contrast,"contrast")
(invert,"invert")
(invert_rgb,"invert_rgb");
composite_mode_e comp_op_from_string(std::string const& name)
{
comp_op_lookup_type::right_const_iterator right_iter = comp_lookup.right.find(name);
if (right_iter != comp_lookup.right.end())
{
return right_iter->second;
}
return clear;
}
template <typename T1, typename T2>
void composite(T1 & im, T2 & im2, composite_mode_e mode)
{
typedef agg::rgba8 color;
typedef agg::order_bgra order;
typedef agg::order_rgba order;
typedef agg::pixel32_type pixel_type;
typedef agg::comp_op_adaptor_rgba<color, order> blender_type;
typedef agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_type;
@ -51,94 +95,8 @@ void composite(T1 & im, T2 & im2, composite_mode_e mode)
agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixf(source);
pixf.premultiply();
agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixf_mask(mask);
switch(mode)
{
case clear :
pixf.comp_op(agg::comp_op_clear);
break;
case src:
pixf.comp_op(agg::comp_op_src);
break;
case dst:
pixf.comp_op(agg::comp_op_dst);
break;
case src_over:
pixf.comp_op(agg::comp_op_src_over);
break;
case dst_over:
pixf.comp_op(agg::comp_op_dst_over);
break;
case src_in:
pixf.comp_op(agg::comp_op_src_in);
break;
case dst_in:
pixf.comp_op(agg::comp_op_dst_in);
break;
case src_out:
pixf.comp_op(agg::comp_op_src_out);
break;
case dst_out:
pixf.comp_op(agg::comp_op_dst_out);
break;
case src_atop:
pixf.comp_op(agg::comp_op_src_atop);
break;
case dst_atop:
pixf.comp_op(agg::comp_op_dst_atop);
break;
case _xor:
pixf.comp_op(agg::comp_op_xor);
break;
case plus:
pixf.comp_op(agg::comp_op_plus);
break;
case minus:
pixf.comp_op(agg::comp_op_minus);
break;
case multiply:
pixf.comp_op(agg::comp_op_multiply);
break;
case screen:
pixf.comp_op(agg::comp_op_screen);
break;
case overlay:
pixf.comp_op(agg::comp_op_overlay);
break;
case darken:
pixf.comp_op(agg::comp_op_darken);
break;
case lighten:
pixf.comp_op(agg::comp_op_lighten);
break;
case color_dodge:
pixf.comp_op(agg::comp_op_color_dodge);
break;
case color_burn:
pixf.comp_op(agg::comp_op_color_burn);
break;
case hard_light:
pixf.comp_op(agg::comp_op_hard_light);
break;
case soft_light:
pixf.comp_op(agg::comp_op_soft_light);
break;
case difference:
pixf.comp_op(agg::comp_op_difference);
break;
case exclusion:
pixf.comp_op(agg::comp_op_exclusion);
break;
case contrast:
pixf.comp_op(agg::comp_op_contrast);
break;
case invert:
pixf.comp_op(agg::comp_op_invert);
break;
case invert_rgb:
pixf.comp_op(agg::comp_op_invert_rgb);
break;
}
pixf.comp_op(static_cast<agg::comp_op_e>(mode));
renderer_type ren(pixf);
agg::renderer_base<pixfmt_type> rb(pixf);
rb.blend_from(pixf_mask,0,0,0,255);