Commit graph

4480 commits

Author SHA1 Message Date
Artem Pavlenko
ff386e686e Merge remote-tracking branch 'origin/master'
Conflicts:
	src/feature_style_processor.cpp
2012-01-10 21:38:43 +00:00
Artem Pavlenko
ec8661b5d4 Merge remote-tracking branch 'origin/master'
Conflicts:
	src/feature_style_processor.cpp
2012-01-10 21:38:43 +00:00
Artem Pavlenko
4bf5ff57b1 + fix typo 2012-01-10 21:32:51 +00:00
Artem Pavlenko
3011d53e34 + fix typo 2012-01-10 21:32:51 +00:00
Artem Pavlenko
3f0fdeadf0 Merge pull request #1014 from tmcw/unbuffered_extent
Unbuffered extent
2012-01-10 13:31:29 -08:00
Artem Pavlenko
8652bfdae8 Merge pull request #1014 from tmcw/unbuffered_extent
Unbuffered extent
2012-01-10 13:31:29 -08:00
Dane Springmeyer
344f855bb6 fix compile with RENDERING_STATS 2012-01-10 13:27:41 -08:00
Dane Springmeyer
c734c516ae fix compile with RENDERING_STATS 2012-01-10 13:27:41 -08:00
Hermann Kraus
cbcb545b65 Fix the problem reported in #1003 (NE, NW, SE not working for text-placement=simple).
Add test cases for this problem.

Conflicts:

	src/text_placements.cpp
	tests/data/placement/clean.sh
	tests/data/placement/test.py
2012-01-09 23:30:22 +01:00
Hermann Kraus
f4f1e84420 Fix the problem reported in #1003 (NE, NW, SE not working for text-placement=simple).
Add test cases for this problem.

Conflicts:

	src/text_placements.cpp
	tests/data/placement/clean.sh
	tests/data/placement/test.py
2012-01-09 23:30:22 +01:00
Tom MacWright
54ecfdbe9f Merge branch 'master' into unbuffered_extent 2012-01-09 13:13:09 -05:00
Tom MacWright
1640252b69 Merge branch 'master' into unbuffered_extent 2012-01-09 13:13:09 -05:00
Dane Springmeyer
1fa26fa067 close #970 by removing non-north-up restriction which appears not to be working properly 2012-01-09 08:39:22 -08:00
Dane Springmeyer
8d11b0f16e close #970 by removing non-north-up restriction which appears not to be working properly 2012-01-09 08:39:22 -08:00
Dane Springmeyer
90cf1a226a use declared iterator 2012-01-09 08:38:46 -08:00
Dane Springmeyer
f8b9cb4db4 use declared iterator 2012-01-09 08:38:46 -08:00
Artem Pavlenko
e8541e1685 Merge branch 'master' of https://github.com/tarnowsc/mapnik 2012-01-09 13:10:55 +00:00
Artem Pavlenko
ba03c5a28f Merge branch 'master' of https://github.com/tarnowsc/mapnik 2012-01-09 13:10:55 +00:00
Artem Pavlenko
e9cb534ee3 + store face index for faster access
+ avoid memory leaks
2012-01-09 13:09:19 +00:00
Artem Pavlenko
1ad6e107d3 + store face index for faster access
+ avoid memory leaks
2012-01-09 13:09:19 +00:00
Cezary Tarnowski
88af05fadc bugfix - a proper bugfix for rewinding geometry in building symbolizer 2012-01-09 13:41:38 +01:00
Cezary Tarnowski
4084d58309 bugfix - a proper bugfix for rewinding geometry in building symbolizer 2012-01-09 13:41:38 +01:00
Artem Pavlenko
2f8557ad12 fix typo 2012-01-09 12:20:25 +00:00
Artem Pavlenko
b90467cbc5 fix typo 2012-01-09 12:20:25 +00:00
Artem Pavlenko
30839b4d17 Merge branch 'master' of https://github.com/tarnowsc/mapnik 2012-01-09 12:20:07 +00:00
Artem Pavlenko
838f6872d4 Merge branch 'master' of https://github.com/tarnowsc/mapnik 2012-01-09 12:20:07 +00:00
Cezary Tarnowski
23631d31a8 bugfix - a proper bugfix for rewinding geometry in building symbolizer 2012-01-09 13:17:03 +01:00
Cezary Tarnowski
7b72898832 bugfix - a proper bugfix for rewinding geometry in building symbolizer 2012-01-09 13:17:03 +01:00
Artem Pavlenko
a95603713a + initialize FT_Face to null
+ add missing bracket
2012-01-09 12:15:14 +00:00
Artem Pavlenko
d307eff124 + initialize FT_Face to null
+ add missing bracket
2012-01-09 12:15:14 +00:00
cpsandbox
2379b561af Update src/font_engine_freetype.cpp 2012-01-08 23:06:27 -08:00
cpsandbox
ccb4340164 Update src/font_engine_freetype.cpp 2012-01-08 23:06:27 -08:00
cpsandbox
e75f00cdf4 adding support for multiple fonts in one font file, for instance .ttc 2012-01-08 21:55:18 -08:00
cpsandbox
621ebac674 adding support for multiple fonts in one font file, for instance .ttc 2012-01-08 21:55:18 -08:00
Dane Springmeyer
1b3d2324de scons: fully workaround potential compile error with gcc/boost 1.42/ubuntu relating to interprocess bug - refs #1001 and #950 2012-01-08 17:21:04 -08:00
Dane Springmeyer
e9bb5666e7 scons: fully workaround potential compile error with gcc/boost 1.42/ubuntu relating to interprocess bug - refs #1001 and #950 2012-01-08 17:21:04 -08:00
Dane Springmeyer
9b859bbc81 scons: pass boost version through env 2012-01-08 17:13:19 -08:00
Dane Springmeyer
5b167b4fa2 scons: pass boost version through env 2012-01-08 17:13:19 -08:00
Dane Springmeyer
520f36938f recommend 1.46 since that dodges the ubuntu issue with interprocess - refs #950 and #1001 2012-01-08 16:08:08 -08:00
Dane Springmeyer
894494a07d recommend 1.46 since that dodges the ubuntu issue with interprocess - refs #950 and #1001 2012-01-08 16:08:08 -08:00
Dane Springmeyer
ca1b5ea7ac Revert "recommend 1.46 since that dodges the ubuntu issue with interprocess - refs #950 and #1001"
This reverts commit 60059970fa.
2012-01-08 16:07:17 -08:00
Dane Springmeyer
156026c581 Revert "recommend 1.46 since that dodges the ubuntu issue with interprocess - refs #950 and #1001"
This reverts commit 60059970fa.
2012-01-08 16:07:17 -08:00
Dane Springmeyer
60059970fa recommend 1.46 since that dodges the ubuntu issue with interprocess - refs #950 and #1001 2012-01-08 16:03:04 -08:00
Dane Springmeyer
69f4cece93 recommend 1.46 since that dodges the ubuntu issue with interprocess - refs #950 and #1001 2012-01-08 16:03:04 -08:00
Dane Springmeyer
b01e6efccc clarify recommended boost versions - closes #1001 2012-01-08 15:55:47 -08:00
Dane Springmeyer
34e0cd7044 clarify recommended boost versions - closes #1001 2012-01-08 15:55:47 -08:00
Dane Springmeyer
baa0fa37b4 fix compile with older boost 2012-01-06 16:22:39 -08:00
Dane Springmeyer
954cb664ba fix compile with older boost 2012-01-06 16:22:39 -08:00
Dane Springmeyer
e649bb42cf make failing osm plugin test a todo 2012-01-05 18:49:41 -08:00
Dane Springmeyer
f83b0edbe5 make failing osm plugin test a todo 2012-01-05 18:49:41 -08:00