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

+ implement grain-merge blending mode (GIMP)

Browse source
This commit is contained in:
Artem Pavlenko 2012-05-25 10:35:43 +01:00
parent b7052029d8
commit 6bea57d690
4 changed files with 2413 additions and 2365 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4770
deps/agg/include/agg_pixfmt_rgba.h vendored
View file

File diff suppressed because it is too large Load diff

3
include/mapnik/image_compositing.hpp
View file

@ -68,7 +68,8 @@ enum composite_mode_e
exclusion, exclusion,
contrast, contrast,
invert, invert,
invert_rgb invert_rgb,
grain_merge
}; };
MAPNIK_DECL boost::optional<composite_mode_e> comp_op_from_string(std::string const& name); MAPNIK_DECL boost::optional<composite_mode_e> comp_op_from_string(std::string const& name);

1
src/cairo_renderer.cpp
View file

@ -382,6 +382,7 @@ public:
case minus: case minus:
case invert: case invert:
case invert_rgb: case invert_rgb:
case grain_merge:
break; break;
} }
} }

4
src/image_compositing.cpp
View file

@ -67,7 +67,9 @@ static const comp_op_lookup_type comp_lookup = boost::assign::list_of<comp_op_lo
(exclusion,"exclusion") (exclusion,"exclusion")
(contrast,"contrast") (contrast,"contrast")
(invert,"invert") (invert,"invert")
(invert_rgb,"invert-rgb"); (invert_rgb,"invert-rgb")
(grain_merge,"grain-merge")
;
boost::optional<composite_mode_e> comp_op_from_string(std::string const& name) boost::optional<composite_mode_e> comp_op_from_string(std::string const& name)
{ {