Dane Springmeyer
|
09426bf324
|
remove option to link againt external AGG - our local copy has critical fixes and is required
|
2012-05-24 17:05:51 -07:00 |
|
Artem Pavlenko
|
a72ee4ba66
|
Merge branch 'master' into compositing
Conflicts:
include/mapnik/image_compositing.hpp
include/mapnik/util/conversions.hpp
include/mapnik/value.hpp
src/agg/agg_renderer.cpp
src/agg/process_line_symbolizer.cpp
src/agg/process_polygon_symbolizer.cpp
src/png_reader.cpp
src/svg_parser.cpp
utils/svg2png/svg2png.cpp
|
2012-05-01 12:35:49 +01:00 |
|
Dane Springmeyer
|
f8c58c22c6
|
scons: fixup pgsql2pqlite build by ensuring CXXFLAGS are passed
|
2012-04-23 12:48:30 -07:00 |
|
Dane Springmeyer
|
c69db365db
|
scons: pass proper CXXFLAGS to svg2png build
|
2012-04-23 15:22:04 -04:00 |
|
Dane Springmeyer
|
e986bce7f6
|
format c++ tests
|
2012-04-16 22:33:37 -07:00 |
|
Dane Springmeyer
|
9fe698e409
|
svg2png: better error output
|
2012-04-11 12:35:07 -07:00 |
|
Dane Springmeyer
|
65f5909e93
|
svg2png: only open automatically if requested
|
2012-04-11 10:41:50 -07:00 |
|
Dane Springmeyer
|
14841f6931
|
svg2png: avoid a few lines of spurious valgrand output re: still reachable xml2 parser structures
|
2012-04-11 10:17:03 -07:00 |
|
Dane Springmeyer
|
b22d043d80
|
svg2png: only attempt to open automatically on os x, and do not return after first rendered
|
2012-04-11 09:49:50 -07:00 |
|
Dane Springmeyer
|
c6c08e50e4
|
embed version in the epydoc output
|
2012-04-09 13:54:33 -07:00 |
|
Artem Pavlenko
|
603a6e133b
|
+ use agg::pixfmt_rgba32
|
2012-04-03 13:13:37 +01:00 |
|
Dane Springmeyer
|
78b53b4afe
|
rename dtd
|
2012-03-14 15:33:55 -07:00 |
|
Dane Springmeyer
|
ba9c6dd220
|
mapnik-speed-check: ensure the bbox arg is set properly
|
2012-03-09 12:04:37 -08:00 |
|
Dane Springmeyer
|
c272835335
|
yet another -fpermissive - refs #1082, #950 and #1001
|
2012-02-14 12:03:44 -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 |
|
Dane Springmeyer
|
3fa794c6ac
|
whitespace fixes
|
2012-02-01 17:37:58 -08:00 |
|
Dane Springmeyer
|
6b584e826a
|
clean up more mapnik2 references
|
2012-02-01 16:44:50 -08:00 |
|
Artem Pavlenko
|
b90de4874c
|
Merge branch 'textplacement-merge' into feature-text-merge
Conflicts:
docs/textrendering.gv
include/mapnik/building_symbolizer.hpp
include/mapnik/placement_finder.hpp
include/mapnik/symbolizer_helpers.hpp
include/mapnik/text_placements.hpp
include/mapnik/text_placements_list.hpp
include/mapnik/text_placements_simple.hpp
include/mapnik/text_processing.hpp
plugins/input/shape/shape_utils.hpp
src/agg/process_shield_symbolizer.cpp
src/agg/process_text_symbolizer.cpp
src/cairo_renderer.cpp
src/grid/process_shield_symbolizer.cpp
src/grid/process_text_symbolizer.cpp
src/load_map.cpp
src/placement_finder.cpp
src/shield_symbolizer.cpp
src/text_placements.cpp
src/text_processing.cpp
src/text_symbolizer.cpp
tests/visual_tests/clean.sh
tests/visual_tests/test.py
Merge herm/textplacement-merge
|
2012-01-31 11:09:55 +00:00 |
|
Hermann Kraus
|
822786e41c
|
Remove no-text attribute. One can simply leave the text empty if one wants this.
|
2012-01-29 13:10:14 +01:00 |
|
Artem Pavlenko
|
d1f16bb227
|
merge textplacement-merge into feature_impl
|
2012-01-26 13:04:08 +00:00 |
|
Artem Pavlenko
|
b89f5cbbbc
|
update pdsql2sqlite to new feature_impl
|
2012-01-23 08:40:16 +00:00 |
|
Hermann Kraus
|
537231f60e
|
Remove glyph symbolizer.
|
2012-01-19 20:34:09 +01:00 |
|
Dane Springmeyer
|
fadb593878
|
Merge branch 'master' of https://github.com/mapnik/mapnik
|
2011-12-21 12:58:32 -08:00 |
|
Dane Springmeyer
|
6a6c493e03
|
Merge branch 'master' of https://github.com/mapnik/mapnik
|
2011-12-21 12:58:32 -08:00 |
|
Dane Springmeyer
|
9f4fa0b820
|
fixup static linking for pgsql2sqlite build
|
2011-12-21 12:58:10 -08:00 |
|
Dane Springmeyer
|
3ede1b13db
|
fixup static linking for pgsql2sqlite build
|
2011-12-21 12:58:10 -08:00 |
|
Dane Springmeyer
|
de932bd99b
|
remove last reference to multiple_geometries option
|
2011-12-21 12:22:43 -08:00 |
|
Dane Springmeyer
|
b6e78ab06b
|
remove last reference to multiple_geometries option
|
2011-12-21 12:22:43 -08:00 |
|
Dane Springmeyer
|
fd895f9533
|
Merge branch 'master' of https://github.com/mapnik/mapnik
|
2011-12-16 16:07:57 -08:00 |
|
Dane Springmeyer
|
b2762b3a91
|
Merge branch 'master' of https://github.com/mapnik/mapnik
|
2011-12-16 16:07:57 -08:00 |
|
Dane Springmeyer
|
bc7457097b
|
update as per #992
|
2011-12-16 07:41:36 -08:00 |
|
Dane Springmeyer
|
a8aef1f92c
|
update as per #992
|
2011-12-16 07:41:36 -08:00 |
|
Dane Springmeyer
|
6330978cce
|
move the json config into the main script
|
2011-12-14 15:51:57 -08:00 |
|
Dane Springmeyer
|
d03815276e
|
move the json config into the main script
|
2011-12-14 15:51:57 -08:00 |
|
Artem Pavlenko
|
20478770ac
|
cleanup unused code
|
2011-12-08 19:46:07 +00:00 |
|
Artem Pavlenko
|
377ff553bb
|
cleanup unused code
|
2011-12-08 19:46:07 +00:00 |
|
Artem Pavlenko
|
5259982792
|
update to_wkb params
|
2011-12-08 18:16:15 +00:00 |
|
Artem Pavlenko
|
11b44c20cd
|
update to_wkb params
|
2011-12-08 18:16:15 +00:00 |
|
Dane Springmeyer
|
b8632c20d4
|
remove non-existant option
|
2011-12-07 13:02:29 -08:00 |
|
Dane Springmeyer
|
c2e1256eae
|
remove non-existant option
|
2011-12-07 13:02:29 -08:00 |
|
Dane Springmeyer
|
1700ffe9cf
|
remove svn revision reporting as it is not longer relevant to git versioned mapnik
|
2011-12-06 16:52:50 -08:00 |
|
Dane Springmeyer
|
1190f3003d
|
remove svn revision reporting as it is not longer relevant to git versioned mapnik
|
2011-12-06 16:52:50 -08:00 |
|
Artem Pavlenko
|
96d4958170
|
output all attributes
|
2011-12-02 17:18:28 +00:00 |
|
Artem Pavlenko
|
977c50d459
|
output all attributes
|
2011-12-02 17:18:28 +00:00 |
|
Artem Pavlenko
|
55f5fed310
|
add geometry_to_wkb test utililty
|
2011-12-02 16:34:22 +00:00 |
|
Artem Pavlenko
|
c5adf240b0
|
add geometry_to_wkb test utililty
|
2011-12-02 16:34:22 +00:00 |
|
Dane Springmeyer
|
01b0c0b15a
|
catch a few more mapnik2 references
|
2011-11-23 20:35:43 -08:00 |
|
Dane Springmeyer
|
b1492d24ab
|
catch a few more mapnik2 references
|
2011-11-23 20:35:43 -08:00 |
|
Dane Springmeyer
|
7b6696ff06
|
remove last traces of ogcserver
|
2011-11-23 20:30:53 -08:00 |
|
Dane Springmeyer
|
a1eb094e41
|
remove last traces of ogcserver
|
2011-11-23 20:30:53 -08:00 |
|