Commit graph

5642 commits

Author SHA1 Message Date
Dane Springmeyer
d87d9fd16d Merge branch 'master' of github.com:mapnik/mapnik 2012-08-15 16:59:30 -07:00
Dane Springmeyer
de3afda3bc remove css_color_grammar_deprecated.hpp 2012-08-15 16:59:22 -07:00
Dane Springmeyer
5c0e1de35b repair boost 1.46 compile in json/feature_grammar.cpp - closes #1342 2012-08-15 16:49:13 -07:00
Dane Springmeyer
4390f14e9e repair boost 1.42 compile with transform_expression_grammar.cpp 2012-08-15 16:45:18 -07:00
Dane Springmeyer
9aa0eec63d fix naming of wkt_generator 2012-08-15 16:44:23 -07:00
Dane Springmeyer
4cf1484b53 disable colorize-alpha comp-op as per #1371 2012-08-15 14:46:58 -07:00
Dane Springmeyer
e4a4fe41c2 do not use /usr/local as default proj search path - instead match all other defaults as /usr/ - closes #1288 2012-08-15 14:16:49 -07:00
Dane Springmeyer
91b15c4cdf remove python pickling for map/style/rule/symbolizers/fontset/query - refs #1391 2012-08-15 13:55:36 -07:00
Dane Springmeyer
b8a0587c29 disable deepcopy in python bindings until this is more solid - refs #1390 2012-08-15 13:27:44 -07:00
Dane Springmeyer
9e85944d93 remove unneeded import 2012-08-15 13:27:10 -07:00
Dane Springmeyer
107c72563f avoid some msvc compiler warnings in gdal input- refs #1103 2012-08-15 12:37:17 -07:00
Dane Springmeyer
953186f376 followup to aecf0531f5 2012-08-15 10:36:44 -07:00
Dane Springmeyer
71e0edc7bf forward declare CoordTransform in map.hpp 2012-08-15 10:33:31 -07:00
Dane Springmeyer
2b108b7cdb fixup includes 2012-08-15 10:26:20 -07:00
Dane Springmeyer
f8e563b4fa fixup includes 2012-08-15 10:25:29 -07:00
Dane Springmeyer
6f5d6f65b1 include what you use 2012-08-15 10:24:56 -07:00
artemp
a991c73a98 + geojson grammar : close linear_rings 2012-08-15 16:53:28 +01:00
artemp
c4765d72ce + close linear_rings in WKT parser 2012-08-15 16:42:46 +01:00
artemp
e2b657251d + various cleanups
+ remove alpha pre-multiplication from cairo_pattern to
  match agg output
2012-08-15 10:55:12 +01:00
artemp
aecf0531f5 + remove metawriters for the upcoming 2.1 release 2012-08-15 09:47:03 +01:00
Dane Springmeyer
f057f43dac fix grid/markers tests after a57996e661 - refs #1309 2012-08-14 17:20:19 -07:00
Dane Springmeyer
a57996e661 sync markers rendering between agg and grid - closes #1309 2012-08-14 17:18:44 -07:00
Hermann Kraus
f9edcb71e0 Reenable support for metawriters.
Implementations in individual metawriters are still missing.
2012-08-15 02:11:11 +02:00
Dane Springmeyer
7a5f06656c allow setting marker width/height together with transform 2012-08-14 17:11:08 -07:00
Dane Springmeyer
3d048c5f72 add ticket reference for workaround added in 60d843a7a8 2012-08-14 12:19:56 -07:00
artemp
34ce663460 + change agg-stack-filter grammar to expect fun(a,b) notation 2012-08-14 20:03:49 +01:00
artemp
8d14ac7e00 + use comma and space as delimiters 2012-08-14 19:57:28 +01:00
Dane Springmeyer
7961a12281 Merge branch 'master' of github.com:mapnik/mapnik 2012-08-14 10:44:29 -07:00
Dane Springmeyer
fbf9ac8399 support new clipping extent padding method in cairo line_symbolizer rendering as per #1282 - partial revert of 76569cccb8 2012-08-14 10:43:46 -07:00
artemp
bee09477a8 + cairo : fix shield scaling 2012-08-14 17:14:30 +01:00
Dane Springmeyer
d7d088cc97 Merge branch 'master' of github.com:mapnik/mapnik 2012-08-14 09:04:06 -07:00
artemp
f35f394b30 + cairo : impl raster markers support 2012-08-14 12:58:00 +01:00
Dane Springmeyer
d8bb4050c5 minor grid rendering test touchups 2012-08-13 16:52:31 -07:00
Dane Springmeyer
9f450bd986 avoid silencing invalid transform throw and use LOG_ERROR for invalid maximum-extent - closes #1363 2012-08-13 15:35:22 -07:00
Dane Springmeyer
339fd59293 +reflect line_symbolizer offset 2012-08-13 14:06:11 -07:00
Dane Springmeyer
4ccf40038e add preferred assignment syntax for zero initialization 2012-08-13 11:27:02 -07:00
Dane Springmeyer
e2b3322934 use typedef for color_type 2012-08-13 11:26:34 -07:00
Hermann Kraus
79ad6b395e Implement label-position-tolerance. 2012-08-13 02:31:08 +02:00
Hermann Kraus
75f250934f Reorder code. 2012-08-12 23:22:44 +02:00
Hermann Kraus
76c3868028 Fix jalign. 2012-08-12 22:55:56 +02:00
Hermann Kraus
61ebd8ae78 Cache iterators. 2012-08-12 22:54:13 +02:00
Hermann Kraus
2a0a52fba2 Update tests. 2012-08-12 15:30:54 +02:00
Hermann Kraus
1dba0581c2 Merge branch 'master' into harfbuzz
Conflicts:
	src/cairo_renderer.cpp
2012-08-12 12:32:35 +02:00
Hermann Kraus
ec58dd9f18 Implement jalign for line placements. 2012-08-12 03:34:48 +02:00
Hermann Kraus
e7f0ae01bd Fix line ordering for upright="left/auto". 2012-08-12 02:50:36 +02:00
Hermann Kraus
37a5552bbd Implement offsets and multiline rendering. 2012-08-12 02:46:26 +02:00
Hermann Kraus
14891379d0 Add compatibility layer with normal path interface. 2012-08-11 23:26:45 +02:00
Hermann Kraus
46fa3cab43 Reenable grid renderer. 2012-08-11 21:47:45 +02:00
Hermann Kraus
9927ae6f60 Change text_renderer class. 2012-08-11 21:22:26 +02:00
Hermann Kraus
47025661f6 Implement collision detection. 2012-08-11 20:46:58 +02:00