Dane Springmeyer
|
b36739fd88
|
apply mapnik_format.el formatting
|
2012-03-13 07:59:22 -07:00 |
|
Dane Springmeyer
|
76e108ff9d
|
remove uneeded shared_ptr copy
|
2012-03-13 07:58:38 -07:00 |
|
Dane Springmeyer
|
93995d7c4b
|
apply mapnik_format.el formatting
|
2012-03-13 07:56:11 -07:00 |
|
Dane Springmeyer
|
2f10469c8d
|
apply mapnik_format.el formatting
|
2012-03-13 07:54:32 -07:00 |
|
Dane Springmeyer
|
015f666e9e
|
tests: remove ancient CssParameter holdovers
|
2012-03-13 07:42:33 -07:00 |
|
Artem Pavlenko
|
3f681a7504
|
+ move mapnik::context_ptr to initialization list
|
2012-03-13 10:19:46 +00:00 |
|
Artem Pavlenko
|
3891922b28
|
use const ref and avoid creating temp std::string
|
2012-03-13 10:11:58 +00:00 |
|
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
|
150de2aac5
|
Add rapidxml parser.
|
2012-03-13 09:02:53 +01:00 |
|
Dane Springmeyer
|
fb6bf401e9
|
avoid constructing extra temp object
|
2012-03-12 13:22:07 -07:00 |
|
Dane Springmeyer
|
42f9fe03d2
|
remove old shim
|
2012-03-12 13:21:38 -07:00 |
|
Artem Pavlenko
|
207ecfd597
|
remove camel-case names from layer.[h,c]pp
|
2012-03-12 15:39:59 +00:00 |
|
Artem Pavlenko
|
5ec3fb1121
|
avoid constructing extra temp object
|
2012-03-12 13:07:36 +00:00 |
|
Hermann Kraus
|
f25a2231ff
|
Warn about unused XML elements.
|
2012-03-12 02:12:58 +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 |
|
Hermann Kraus
|
c2f9e3b637
|
Include correct file in csv datasource.
|
2012-03-11 23:07:39 +01:00 |
|
Dane Springmeyer
|
a6f89883d7
|
moar boost::make_shared
|
2012-03-09 16:20:50 -08:00 |
|
Dane Springmeyer
|
ddd3956f0e
|
expose a clear method for the marker_cache and mapped_memory_cache - closes #1022
|
2012-03-09 15:16:01 -08:00 |
|
Dane Springmeyer
|
71333373cc
|
use boost::make_shared to create new face_ptr
|
2012-03-09 15:15:04 -08:00 |
|
Dane Springmeyer
|
9d0bfa9d4e
|
the std::map storing font_face pointers is a cache - name it clearly
|
2012-03-09 14:47:04 -08:00 |
|
Dane Springmeyer
|
ba9c6dd220
|
mapnik-speed-check: ensure the bbox arg is set properly
|
2012-03-09 12:04:37 -08:00 |
|
Artem Pavlenko
|
302b7f1696
|
Revert "update rasterlite, occi, csv, hello_world, and rundemo"
This reverts commit ab7f6ee75c .
|
2012-03-09 15:33:36 +00:00 |
|
Artem Pavlenko
|
e8758b96a6
|
+ fix init order
|
2012-03-09 14:26:52 +00:00 |
|
Artem Pavlenko
|
254b3c9fa7
|
Merge branch 'master' into geometry-clipping
Conflicts:
SConstruct
include/mapnik/symbolizer_helpers.hpp
src/placement_finder.cpp
|
2012-03-09 14:18:41 +00:00 |
|
Artem Pavlenko
|
5ce18715c3
|
+ update cairo_renderer to use clipped paths
|
2012-03-09 13:40:18 +00:00 |
|
Artem Pavlenko
|
61113d7b4e
|
+ add clipping to text/shield/markers
Conflicts:
include/mapnik/symbolizer_helpers.hpp
|
2012-03-09 13:37:53 +00:00 |
|
Artem Pavlenko
|
a763d03110
|
resolve conflict
|
2012-03-09 13:33:16 +00:00 |
|
Artem Pavlenko
|
961ab51aef
|
+ fix previous merge error
|
2012-03-09 13:23:50 +00:00 |
|
Dane Springmeyer
|
ab7f6ee75c
|
update rasterlite, occi, csv, hello_world, and rundemo
|
2012-03-09 12:58:16 +00:00 |
|
Artem Pavlenko
|
514ec14cc9
|
+ add clipping to polygon/line_pattern_syms
|
2012-03-09 12:57:14 +00:00 |
|
Artem Pavlenko
|
d8d5298f4e
|
+ update cairo_renderer to use clipped paths
|
2012-03-09 12:56:54 +00:00 |
|
Dane Springmeyer
|
54e7bb41c6
|
add no-omit-frame-pointer to debug flags to ensure without question it is not enabled
|
2012-03-09 12:56:00 +00:00 |
|
Dane Springmeyer
|
b67af5cadb
|
avoid combining default arg with const&
|
2012-03-09 12:55:41 +00:00 |
|
Artem Pavlenko
|
13ea874585
|
+ inflate query extent to avoid line joining artifacts
|
2012-03-09 12:55:22 +00:00 |
|
Artem Pavlenko
|
11511e9b20
|
+ cleanup
|
2012-03-09 12:55:03 +00:00 |
|
Artem Pavlenko
|
40b9553722
|
+ add clipping to text/shield/markers
Conflicts:
include/mapnik/symbolizer_helpers.hpp
|
2012-03-09 12:54:13 +00:00 |
|
Artem Pavlenko
|
c12161bf19
|
+ clip geometries before applying any
transformations.
|
2012-03-09 12:44:29 +00:00 |
|
Dane Springmeyer
|
86ac497584
|
minor formatting
Conflicts:
src/placement_finder.cpp
|
2012-03-09 12:42:08 +00:00 |
|
Dane Springmeyer
|
99a181e196
|
fix spelling
|
2012-03-09 12:37:27 +00:00 |
|
Hermann Kraus
|
b71460d4dd
|
Don't return pointer to dead object.
|
2012-03-09 13:26:11 +01:00 |
|
Dane Springmeyer
|
c5c0f92247
|
save the maps in the right place for visual tests
|
2012-03-08 17:04:51 -08:00 |
|
Dane Springmeyer
|
5f4734ebe0
|
fix other potential division by zero conditions - closes #1110
|
2012-03-08 17:02:58 -08:00 |
|
Dane Springmeyer
|
9fb45ebf75
|
allow visual tests to be run from root
|
2012-03-08 17:01:51 -08:00 |
|
Hermann Kraus
|
cd8cfc6527
|
Improve error messages.
|
2012-03-08 18:52:53 +01:00 |
|
Hermann Kraus
|
8b0b9ed5fe
|
Handle different image sizes correctly.
|
2012-03-08 18:29:46 +01:00 |
|
Dane Springmeyer
|
3add1f984c
|
add Geos plugin to exported module scope
|
2012-03-08 08:40:12 -08:00 |
|
Dane Springmeyer
|
b7f27c13d0
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2012-03-08 08:38:19 -08:00 |
|
Dane Springmeyer
|
f1aee03912
|
forward declare marker so marker_cache api access is cleaner
|
2012-03-08 08:37:58 -08:00 |
|
Hermann Kraus
|
adc8f9df1b
|
Fix PointSymbolizer problem.
|
2012-03-08 13:00:40 +01:00 |
|