Dane Springmeyer
|
ca89dd7b31
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2012-02-14 12:18:46 -08:00 |
|
Dane Springmeyer
|
c272835335
|
yet another -fpermissive - refs #1082, #950 and #1001
|
2012-02-14 12:03:44 -08:00 |
|
Artem Pavlenko
|
843537247a
|
Merge remote-tracking branch 'origin/master'
|
2012-02-14 18:40:16 +00:00 |
|
Artem Pavlenko
|
6495ea8996
|
+ clip polygons
|
2012-02-14 18:39:36 +00:00 |
|
Artem Pavlenko
|
8116ba4809
|
ident
|
2012-02-14 18:35:00 +00:00 |
|
Artem Pavlenko
|
7e8207236e
|
ident
|
2012-02-14 18:34:29 +00:00 |
|
Dane Springmeyer
|
e2d398f6db
|
add permissive flag to ogr and shape plugins to work around boost interprocess compile bug - closes #1082 - refs #950 and #1001
|
2012-02-14 10:33:40 -08:00 |
|
Artem Pavlenko
|
dc4cc8f197
|
+ base class already derived from boost::noncopyable
|
2012-02-14 18:33:39 +00:00 |
|
Artem Pavlenko
|
58b51b208e
|
use standard_wide::space
|
2012-02-14 18:33:05 +00:00 |
|
Dane Springmeyer
|
9d5591b77a
|
add argument
|
2012-02-13 22:02:23 -08:00 |
|
Dane Springmeyer
|
a18927a0b1
|
Add include
|
2012-02-13 11:59:04 -08:00 |
|
Dane Springmeyer
|
cafb98ed88
|
qi::omit works with boost >=1.46 but not <=1.45 - refs #1074
|
2012-02-13 11:47:55 -08:00 |
|
Dane Springmeyer
|
c74a6390ca
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2012-02-13 11:30:38 -08:00 |
|
Dane Springmeyer
|
ab11f48ce4
|
avoid compiler warning
|
2012-02-13 11:30:27 -08:00 |
|
Hermann Kraus
|
be464f0c5b
|
Move code for makers placement from hpp to cpp.
|
2012-02-13 20:20:09 +01:00 |
|
Dane Springmeyer
|
00a2bec062
|
silence signed/unsigned compiler warning
|
2012-02-13 11:01:58 -08:00 |
|
Dane Springmeyer
|
b866b6d51c
|
remove uneeded variables
|
2012-02-13 11:01:44 -08:00 |
|
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 |
|