Commit graph

31 commits

Author SHA1 Message Date
Dane Springmeyer
c4274ba952 formatting 2013-03-07 16:46:19 -08:00
Dane Springmeyer
3845d56c06 add code comments from mcseem relevant to agg usage questions around scaling and compositing 2012-10-01 14:13:54 -07:00
Dane Springmeyer
4cf1484b53 disable colorize-alpha comp-op as per #1371 2012-08-15 14:46:58 -07:00
Dane Springmeyer
2f45de8fea serialize comp-op in save_map - refs #1292 2012-07-05 17:06:41 -07:00
Tom MacWright
aa5a726b92 Rename color-spin composite operation to colorize alpha
to make it less confusing alongside actual color manipulation
modes.
2012-06-19 17:16:25 -04:00
Dane Springmeyer
4e16618771 clean up coda comments 2012-06-19 08:43:15 -04:00
Artem Pavlenko
a01e1b3b14 Merge remote-tracking branch 'origin/master' 2012-06-18 18:52:06 -04:00
Artem Pavlenko
c5864453a0 + only premultiply src 2012-06-18 18:50:32 -04:00
Dane Springmeyer
62b7a76f29 Merge branch 'master' of github.com:mapnik/mapnik 2012-06-18 18:47:42 -04:00
Dane Springmeyer
751d246f3c move agg rasterization to use and expect consistently premultiplied buffers - refs #1262 2012-06-18 18:47:30 -04:00
Artem Pavlenko
9b61c0effe Merge remote-tracking branch 'origin/master'
Conflicts:
	deps/agg/include/agg_pixfmt_rgba.h
	include/mapnik/image_compositing.hpp
	src/cairo_renderer.cpp
	src/image_compositing.cpp
2012-06-18 14:36:15 -04:00
Artem Pavlenko
c71944bf32 + use HSV color space (as in GIMP)
+ rename 'luminosity' to 'value'
2012-06-18 14:30:01 -04:00
Tom MacWright
f6c10bbb7e Add color_spin composite operation. 2012-06-18 11:10:04 -04:00
Artem Pavlenko
14d365d572 + hue, saturation, color and luminosity blending modes (HSL based)
(http://en.wikipedia.org/wiki/Blend_modes#Hue.2C_saturation_and_luminosity)
2012-06-17 15:19:29 -04:00
Artem Pavlenko
f3c774baa4 + add grain-extract blending mode (gimp) 2012-05-29 15:09:33 +01:00
Artem Pavlenko
6bea57d690 + implement grain-merge blending mode (GIMP) 2012-05-25 10:35:43 +01:00
Dane Springmeyer
54f54ed775 rename composite args 2012-05-11 15:31:35 -07:00
Dane Springmeyer
8ae867f6de default values for composite args to maintain api compatibility 2012-05-11 15:19:05 -07:00
Artem Pavlenko
7380a6a001 + fix raster_symbolizer: add x/y dst args to composite 2012-05-11 10:55:58 +01:00
Artem Pavlenko
8085110e8f + add opacity parameter 2012-05-10 18:14:53 +01:00
Artem Pavlenko
4a9387ea44 + use typedef's 2012-05-07 12:15:04 +01:00
Artem Pavlenko
a72ee4ba66 Merge branch 'master' into compositing
Conflicts:
	include/mapnik/image_compositing.hpp
	include/mapnik/util/conversions.hpp
	include/mapnik/value.hpp
	src/agg/agg_renderer.cpp
	src/agg/process_line_symbolizer.cpp
	src/agg/process_polygon_symbolizer.cpp
	src/png_reader.cpp
	src/svg_parser.cpp
	utils/svg2png/svg2png.cpp
2012-05-01 12:35:49 +01:00
Artem Pavlenko
377f851a69 + fix src-over lookup
+ corrected names to follow SVG spec
2012-04-23 13:02:02 +01:00
Artem Pavlenko
03d42e59a5 + allow specifying premultiply flag for src and dst images
+ fix logic in agg_renderer (TODO)
2012-04-20 14:53:11 +01:00
Dane Springmeyer
cfa2ffc52e better error output when we fail to parse comp-op or image-filters 2012-04-18 07:37:14 -07:00
Artem Pavlenko
81566a8f80 + use pre-multiplied pixel format in agg_renderer
(de-multiply in end_map_processing())
+ support for compositing at style level
+ image blur (TODO)
2012-04-03 13:10:30 +01:00
Artem Pavlenko
9840c7df4c Merge branch 'master' into compositing
Conflicts:
	include/mapnik/util/dasharray_parser.hpp
	src/agg/process_line_symbolizer.cpp
	src/image_compositing.cpp
2012-03-26 09:05:02 +01:00
Dane Springmeyer
35cad0e049 port over bgra -> rgba compositing fix from compositing branch 2012-03-23 17:38:30 -07:00
Artem Pavlenko
aefa23fb5b + boost::bimap based enum<->string lookup table
+ fix pixel_format bgra -> rgba
2012-03-21 15:45:23 +00:00
Artem Pavlenko
f78305428a + remove duplicate typedef's 2012-03-21 10:52:03 +00:00
Dane Springmeyer
89877edc67 move image_compositing to cpp file 2012-03-19 15:42:44 -07:00