Artem Pavlenko
|
5bc9f73506
|
+ markers_symbolizer: support affine geometry transformations
+ fix markers bounding box calc
+ fix spacing logic to use transformed marker width
|
2012-06-26 15:00:42 +01: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 |
|
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
|
dc89f6fac4
|
Merge remote-tracking branch 'origin/master'
|
2012-06-17 15:21:27 -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 |
|
Dane Springmeyer
|
bd7ad7cd3c
|
address #1198 by moving away from caching grid features and (back) to copying attributes - also roll back to passing feature_impl& rather than feature_ptr (which is now unneeded)
|
2012-06-15 22:17:26 -04:00 |
|
Mickey Rose
|
bd9609c370
|
new feature: transform expressions are now dynamic
(cherry picked from commit 173c402b5c142310087246b0ea54dbec54edcac8)
Conflicts:
include/mapnik/vertex_converters.hpp
src/agg/process_markers_symbolizer.cpp
src/agg/process_point_symbolizer.cpp
src/agg/process_polygon_pattern_symbolizer.cpp
src/load_map.cpp
|
2012-06-06 17:34:26 +02:00 |
|
Dane Springmeyer
|
11e81fdb03
|
finish exposing markers symbolizer in python - closes #612
|
2012-06-04 13:42:51 -07:00 |
|
Dane Springmeyer
|
857a6950f7
|
fix warning message for pending features for markers
|
2012-06-04 11:11:29 -07:00 |
|
Artem Pavlenko
|
500f57cf60
|
+ make vertex() and rewind() methods const
+ remove unused coord_transforms
+ rename coord_transform2 to coord_transform
|
2012-05-31 12:13:09 +01:00 |
|
Artem Pavlenko
|
6e23b64244
|
+ don't draw 'frame' to match AGG renderer output
|
2012-05-30 16:29:39 +01:00 |
|
Artem Pavlenko
|
f4539474fc
|
+ scale_factor is 1.0 in cairo renderer
TODO: should consider using variable scale_factor as in AGG
|
2012-05-30 16:27:55 +01:00 |
|
Artem Pavlenko
|
9ae70c4823
|
+ take into account opacity from fill and stroke rgba8 colour
|
2012-05-30 16:26:34 +01:00 |
|
Dane Springmeyer
|
a359c60236
|
include cairo-version header explicitly
|
2012-05-29 16:57:58 -07: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
|
5b0351875b
|
handle older (< 1.10.0) cairo versions that lack support for advanced compositing ops (target: cairo 1.8.10-2ubuntu1 on lucid)
|
2012-05-18 11:31:08 -07:00 |
|
Artem Pavlenko
|
260a098447
|
+ update to use non-optional comp_op
|
2012-05-10 12:10:37 +01:00 |
|
Artem Pavlenko
|
953db9b209
|
+ use vertex_converters where applicable
|
2012-05-09 15:45:44 +01:00 |
|
Artem Pavlenko
|
c475f2f995
|
+ cairo: fix polygon pattern rendering
|
2012-05-03 15:28:57 +01:00 |
|
Artem Pavlenko
|
b0a0ab6d3c
|
+ Cairo: symbolizer level compositing
|
2012-05-03 14:34:17 +01:00 |
|
Artem Pavlenko
|
1b33c584e7
|
+ use MAPNIK_LOG_DEBUG
|
2012-05-03 12:17:37 +01:00 |
|
Artem Pavlenko
|
77dfac5622
|
+ re-introduce transform on symbolizer_with_image
|
2012-05-01 16:47:33 +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 |
|
Dane Springmeyer
|
2f65a7612d
|
allow cairo compile
|
2012-04-18 07:09:12 -07:00 |
|
kunitoki
|
fb94e4a2ec
|
- replace all instances of std::cerr with MAPNIK_LOG_*
|
2012-04-10 00:51:04 +02:00 |
|
kunitoki
|
b60c508c1c
|
- finish thrashing all the useless ifdef MAPNIK_LOG
|
2012-04-09 21:41:56 +02:00 |
|
kunitoki
|
af201551b8
|
got rid of old CVS $Id comments kludge in files
|
2012-04-08 02:45:01 +02:00 |
|
kunitoki
|
1f351e0e09
|
implement new debug system
|
2012-04-08 02:20:56 +02:00 |
|
Dane Springmeyer
|
8c41bdc040
|
remove unused variables
|
2012-04-04 10:30:37 -07:00 |
|
Dane Springmeyer
|
2edaefd0d6
|
cairo: match AGG functionality, adding support for dynamic ellipse drawing and loading from svg icons - closes #1071 (refs #952 - this is stopgap until we refactor and merge with point_symbolizer)
|
2012-03-27 19:21:11 -04:00 |
|
Dane Springmeyer
|
d991427737
|
formatting
|
2012-03-22 16:37:24 -07:00 |
|
Artem Pavlenko
|
c95959c549
|
+ re-use cairo_context
|
2012-03-15 11:29:57 +00:00 |
|
Artem Pavlenko
|
f0bc1064c6
|
+ supprt polygon smoothing in cairo backend
|
2012-03-14 17:38:27 +00:00 |
|
Dane Springmeyer
|
93995d7c4b
|
apply mapnik_format.el formatting
|
2012-03-13 07:56:11 -07:00 |
|
Hermann Kraus
|
2b68cea0a1
|
Merge branch 'new-xml'
Conflicts:
include/mapnik/config_error.hpp
include/mapnik/ptree_helpers.hpp
src/formatting/text.cpp
src/libxml2_loader.cpp
src/load_map.cpp
src/metawriter_factory.cpp
src/text_placements/registry.cpp
src/text_placements/simple.cpp
|
2012-03-13 11:11:28 +01:00 |
|
Artem Pavlenko
|
5ec3fb1121
|
avoid constructing extra temp object
|
2012-03-12 13:07:36 +00:00 |
|
Dane Springmeyer
|
a6f89883d7
|
moar boost::make_shared
|
2012-03-09 16:20:50 -08:00 |
|
Artem Pavlenko
|
254b3c9fa7
|
Merge branch 'master' into geometry-clipping
Conflicts:
SConstruct
include/mapnik/symbolizer_helpers.hpp
src/placement_finder.cpp
|
2012-03-09 14:18:41 +00:00 |
|
Artem Pavlenko
|
5ce18715c3
|
+ update cairo_renderer to use clipped paths
|
2012-03-09 13:40:18 +00:00 |
|
Artem Pavlenko
|
61113d7b4e
|
+ add clipping to text/shield/markers
Conflicts:
include/mapnik/symbolizer_helpers.hpp
|
2012-03-09 13:37:53 +00:00 |
|
Artem Pavlenko
|
d8d5298f4e
|
+ update cairo_renderer to use clipped paths
|
2012-03-09 12:56:54 +00:00 |
|
Artem Pavlenko
|
40b9553722
|
+ add clipping to text/shield/markers
Conflicts:
include/mapnik/symbolizer_helpers.hpp
|
2012-03-09 12:54:13 +00:00 |
|
Artem Pavlenko
|
c12161bf19
|
+ clip geometries before applying any
transformations.
|
2012-03-09 12:44:29 +00:00 |
|
Hermann Kraus
|
cd8cfc6527
|
Improve error messages.
|
2012-03-08 18:52:53 +01:00 |
|
Dane Springmeyer
|
f1aee03912
|
forward declare marker so marker_cache api access is cleaner
|
2012-03-08 08:37:58 -08:00 |
|
Hermann Kraus
|
ad86e9aebc
|
Reenable text meta writers.
|
2012-03-04 23:25:13 +01:00 |
|
Hermann Kraus
|
4638b28c36
|
Store pointer to char_info in text_path instead of pointer to char_properties.
|
2012-03-04 03:53:39 +01:00 |
|