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
|
f214675c69
|
Modify all other files for new XML structure.
|
2012-03-07 02:23:16 +01:00 |
|
Dane Springmeyer
|
943f92fffc
|
initialize another member in text_properties
|
2012-03-05 14:54:30 -08:00 |
|
Dane Springmeyer
|
f3c4f9eec7
|
initialize members of text_symbolizer_properties and char_properties - refs #1114
|
2012-03-05 13:48:35 -08:00 |
|
Dane Springmeyer
|
50a417fc83
|
formatting
|
2012-03-05 11:31:58 -08:00 |
|
Dane Springmeyer
|
f90b410ece
|
formatting to use const& as per 6462af3
|
2012-03-05 11:10:04 -08:00 |
|
Hermann Kraus
|
980cdd9e92
|
Use text_placements registry.
|
2012-02-18 00:39:14 +01:00 |
|
Hermann Kraus
|
6db956ca83
|
Split file.
|
2012-02-17 20:53:00 +01:00 |
|