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 |
|
Hermann Kraus
|
02d8a98b3f
|
Improve error messages.
|
2012-03-12 01:09:26 +01:00 |
|
Hermann Kraus
|
502773bea6
|
Only one grammar object per XML tree.
|
2012-03-11 23:24:28 +01:00 |
|
Dane Springmeyer
|
a6f89883d7
|
moar boost::make_shared
|
2012-03-09 16:20:50 -08:00 |
|
Hermann Kraus
|
cd8cfc6527
|
Improve error messages.
|
2012-03-08 18:52:53 +01:00 |
|
Hermann Kraus
|
daf30ca0d1
|
Update metawriter_factory.hpp
|
2012-03-07 15:26:13 +01:00 |
|
Dane Springmeyer
|
17d13cff67
|
whitespace fixes - closes #911
|
2012-02-01 17:53:35 -08:00 |
|
kunitoki
|
f1fb0c1939
|
- fix copyright to 2011 (script to do this will follow)
|
2011-10-23 15:04:25 +02:00 |
|
Dane Springmeyer
|
85804b797f
|
typo
|
2011-07-16 15:45:40 +00:00 |
|
Hermann Kraus
|
4a7249ca50
|
Actually use the new pixel coordinate function.
|
2011-07-16 12:32:39 +00:00 |
|
Hermann Kraus
|
8bb6df1a07
|
Optionally output JSON data with pixel coordinates.
|
2011-07-16 12:24:52 +00:00 |
|
Artem Pavlenko
|
ec4ef1bb34
|
+ add missing files from 735_metawriter_inmem.patch
|
2011-03-16 16:50:02 +00:00 |
|