Commit graph

6331 commits

Author SHA1 Message Date
Dane Springmeyer
08216606ee formatting 2012-02-13 11:01:25 -08:00
Dane Springmeyer
6b6d069f3e silence compiler warning about signed/unsigned comparison 2012-02-13 11:01:16 -08:00
Hermann Kraus
043dba3786 Merge branch 'cleanup-includes' 2012-02-13 19:37:20 +01:00
Hermann Kraus
f3dc78506b Remove almost empty unused headers. 2012-02-13 18:07:47 +01:00
Hermann Kraus
01e3450dff Add warning for filter_factory.hpp. 2012-02-13 17:03:42 +01:00
Artem Pavlenko
06ae6ae845 + fix #1042 - don't use omit[...] directive with boost_1_42_0 2012-02-13 12:12:13 +00:00
Dane Springmeyer
e2385178f4 install new headers fixing broken node-mapnik compile: https://github.com/mapnik/node-mapnik/issues/85 - refs #1079 2012-02-12 20:53:48 -08:00
Hermann Kraus
828316bffd Remove unused file. 2012-02-12 23:44:05 +01:00
Hermann Kraus
be0f110a76 Fix spelling error. 2012-02-12 23:00:38 +01:00
Hermann Kraus
d3e191ff73 Merge branch 'master' into python-textplacement
Conflicts:
	include/mapnik/formatting/list.hpp
2012-02-12 22:58:02 +01:00
Hermann Kraus
1fd7f9d543 Fix spelling error. 2012-02-12 22:48:44 +01:00
Hermann Kraus
afb2eedbb9 Merge branch 'textplacement-rename' 2012-02-12 14:03:57 +01:00
Hermann Kraus
2b5274c21b Merge branch 'textplacement-rename' into python-textplacement 2012-02-12 13:57:51 +01:00
Hermann Kraus
52702d3a20 Rename filter_factory to expression. 2012-02-12 13:06:39 +01:00
Hermann Kraus
57b835419b Fix font-set handling for ShieldSymbolizer. Closes #1077.
Was the same problem as #1064.
2012-02-12 11:39:39 +01:00
Hermann Kraus
32b492fac1 Fix includes. 2012-02-12 04:06:34 +01:00
Hermann Kraus
9eccd58ed5 Merge branch 'textplacement-rename' into python-textplacement
Conflicts:
	include/mapnik/text_processing.hpp
2012-02-12 04:01:58 +01:00
Hermann Kraus
69f153bf8f Fix all includes. 2012-02-12 03:55:13 +01:00
Hermann Kraus
91ddbd4f73 Move other text placement files. 2012-02-12 03:16:33 +01:00
Hermann Kraus
34638b9e3c Split text_placements.hpp 2012-02-12 03:11:58 +01:00
Hermann Kraus
18004ca7fb Move processed_text. 2012-02-12 02:52:00 +01:00
Hermann Kraus
fbe929810b Fix most includes. 2012-02-12 02:47:26 +01:00
Hermann Kraus
6c29a12f24 Move text_symbolizer_properties. 2012-02-12 02:24:26 +01:00
Hermann Kraus
d7da55be15 Move char_properties. 2012-02-12 02:19:31 +01:00
Hermann Kraus
508ce0b65d Move formating::format_node. 2012-02-12 02:10:08 +01:00
Hermann Kraus
390b70eb44 Move formating::list_node. 2012-02-12 02:07:36 +01:00
Hermann Kraus
e37070f177 Move formating::text_node. 2012-02-12 02:05:27 +01:00
Hermann Kraus
e2c75c5eef Move formating::node. 2012-02-12 02:01:25 +01:00
Hermann Kraus
86d32afac5 Add string constructor for text node. 2012-02-12 01:49:54 +01:00
Hermann Kraus
dc665bdea1 Merge branch 'master' into python-textplacement 2012-02-12 01:49:15 +01:00
Hermann Kraus
3b2767f167 Add additional constructor for common use case. 2012-02-12 01:48:25 +01:00
Hermann Kraus
67faac351b Merge branch 'master' into python-textplacement 2012-02-11 11:25:28 +01:00
Hermann Kraus
7ef1c3544e Bugfix: Collect expressions for formating::format_node. 2012-02-11 11:24:33 +01:00
Hermann Kraus
c94d32b41b Add bindings for formating::list_node. 2012-02-11 11:21:33 +01:00
Dane Springmeyer
0acd2137b8 restore agg renderer clip_box, accidentally disabled in 21d05444 - refs #1075 2012-02-10 15:14:15 -08:00
Dane Springmeyer
75e264a594 only form up ostringstream if needed 2012-02-10 12:15:23 -08:00
Dane Springmeyer
bfd79276a7 only encode if image has dimensions (avoid abort in png writer on zero size width or height) 2012-02-10 12:14:53 -08:00
Dane Springmeyer
a682212266 small optimization by avoiding repeated case sensitive checks 2012-02-10 11:20:00 -08:00
Dane Springmeyer
4bf8a7f69e boost 1.42 compatibility 2012-02-10 10:31:11 -08:00
Dane Springmeyer
32ac2e464c restore compile for boost 1.42 2012-02-10 10:20:26 -08:00
Artem Pavlenko
eb210581a5 Merge pull request #1073 from MapQuest/shapeindex-null-bug
Pos counter in shapeindex not incremented for null geometry
2012-02-10 08:09:16 -08:00
Matt Amos
38e7b7cce0 Still need to increment pos counter in shapeindex even when the geometry is null, otherwise reads are possible beyond the end of file. 2012-02-10 15:21:02 +00:00
Artem Pavlenko
6a015dcd59 Merge remote-tracking branch 'origin/master' 2012-02-10 11:59:12 +00:00
Artem Pavlenko
602264d368 + implement 'in situ' boost::spirit::qi based geojson parser 2012-02-10 11:56:53 +00:00
Artem Pavlenko
f19bcafbf6 + make wkt_parser noncopyable 2012-02-10 10:53:04 +00:00
Artem Pavlenko
ff66cc1326 + check if index is valid in to_string()
+ output feature id
2012-02-10 10:52:06 +00:00
Dane Springmeyer
6824b87aff add proj 4.7 mutex change to changelog - refs #1072 2012-02-09 17:30:05 -08:00
Dane Springmeyer
0748d2beea avoid mutex locks on pj_transform for proj 4.7 and above - closes #1072 2012-02-09 17:28:31 -08:00
Dane Springmeyer
c33d534b80 link to boost system 2012-02-09 16:00:39 -08:00
Dane Springmeyer
b44a63ac1f link all remaining plugins to boost_system to avoid potential linking errors with boost-trunk (upcoming 1.49) - closes #1070 2012-02-09 16:00:11 -08:00