Commit graph

6719 commits

Author SHA1 Message Date
Hermann Kraus
fbc025ea70 Update text related reference images. 2013-03-25 16:40:41 +01:00
Hermann Kraus
bd940bdc2e Always return a positive number of different pixels. 2013-03-25 12:36:35 +01:00
Hermann Kraus
cb7b9e6a66 Merge branch 'master' into harfbuzz
Conflicts:
	tests/visual_tests/test.py
2013-03-25 04:20:45 +01:00
Hermann Kraus
bcd7b71eba Simplify test scripts. 2013-03-25 04:02:35 +01:00
Hermann Kraus
bca7b3a643 Tests: Fix map loading when agg is disabled. 2013-03-25 02:28:54 +01:00
Hermann Kraus
ab6156a087 Add new test and change handling of scale_factor in tests. 2013-03-25 02:25:05 +01:00
Hermann Kraus
2a6b243ae6 Show bounding boxes for collision test. 2013-03-25 02:24:29 +01:00
Hermann Kraus
29009b14bb Fix shield displacement for scale_factor != 1.
All visual AGG test pass.
2013-03-25 02:11:24 +01:00
Hermann Kraus
f3cf17728b Fix PointSymbolizer collision bounding boxes. 2013-03-24 15:57:54 +01:00
Hermann Kraus
e6b7525d34 Merge branch 'master' into harfbuzz 2013-03-24 15:51:03 +01:00
Hermann Kraus
fe526fd3d6 Fix PointSymbolizer collision bounding boxes. 2013-03-24 15:50:18 +01:00
Hermann Kraus
722b84e53a Yet another character_spacing/scale_factor fix. 2013-03-24 15:37:06 +01:00
Hermann Kraus
c464db99db Merge branch 'master' into harfbuzz 2013-03-24 15:22:17 +01:00
Hermann Kraus
b1bc5a51b3 Apply scale factor to offsets. 2013-03-24 15:21:59 +01:00
Hermann Kraus
5f46e45fc9 boost::noncopyable -> mapnik::noncopyable 2013-03-24 15:10:09 +01:00
Hermann Kraus
1d5ebcb64e More scale_factor fixes. 2013-03-24 15:07:42 +01:00
Hermann Kraus
23b794c67c Implement char_spacing for line placements. 2013-03-24 12:36:57 +01:00
Hermann Kraus
0c4d123602 Fix char spacing for scale_factor != 1. 2013-03-24 12:01:51 +01:00
Hermann Kraus
51832de841 Apply scale factor to halo_radius. 2013-03-24 01:41:33 +01:00
Hermann Kraus
de837ba45d Fix text rendering for scale_factor!=1. 2013-03-24 01:26:42 +01:00
Hermann Kraus
3be7b55459 Fix position calculation for text in cairo renderer. 2013-03-24 01:01:37 +01:00
Hermann Kraus
e5e9b9ea23 Add const qualifier to pixel_position operator~. 2013-03-24 01:01:13 +01:00
Hermann Kraus
fafd229341 Fix test output when creating or overwriting files. 2013-03-24 00:35:44 +01:00
Hermann Kraus
895041897e Split tests into sections. 2013-03-24 00:19:34 +01:00
Hermann Kraus
f18f55991f Remove old reference images. 2013-03-23 23:48:41 +01:00
Hermann Kraus
d1a0fcb7a7 Fix build failures introduced by merges. 2013-03-23 23:48:10 +01:00
Hermann Kraus
5ce472cb4a Merge branch 'master' into harfbuzz 2013-03-23 15:37:36 +01:00
Hermann Kraus
7fae143b58 Merge commit 'c84d83a685ba0e201b055db5a7cee68afde05d64' into harfbuzz
Conflicts:
	src/cairo_renderer.cpp
2013-03-23 15:37:05 +01:00
Hermann Kraus
4beed29cf2 Merge commit 'aa122ea907fa1f31ed76f6e0f12ea9549c86a964' into harfbuzz 2013-03-23 15:32:15 +01:00
Hermann Kraus
95c0259a16 Merge commit '542805e4d6eb6672753bae45ac72887be279f9c7' into harfbuzz
Conflicts:
	tests/visual_tests/test.py
2013-03-23 15:30:35 +01:00
Hermann Kraus
1df49735f8 Manual merge.
Merge commit 'e91908206baf0535934a985f8e0d54db2d67ea88' into harfbuzz

Conflicts:
	src/cairo_context.cpp
2013-03-23 15:29:02 +01:00
Hermann Kraus
4aa2758f12 Merge commit 'f759964dbffd03457c0f13c467f1d890f759aff2' into harfbuzz 2013-03-23 14:42:55 +01:00
Hermann Kraus
9834fb73ed Merge branch 'master' into harfbuzz 2013-03-23 14:39:04 +01:00
Hermann Kraus
62c381dfee Merge commit '06803de192edc3a518f03e8c547b222e24993013' into harfbuzz
Conflicts:
	include/mapnik/cairo_context.hpp
	src/cairo_context.cpp
	src/placement_finder.cpp
2013-03-23 14:38:56 +01:00
Hermann Kraus
cc4473cac9 Merge commit '5e224bd705b33a4574e379490a94d5063fdeaf00' into harfbuzz 2013-03-23 14:37:38 +01:00
Hermann Kraus
30c536bab1 Merge branch 'hb-test' into harfbuzz. 2013-03-23 13:55:56 +01:00
Hermann Kraus
7392523d22 Fixed tests.
Results:
AGG with scale factor 1.0: pass
Others: fail
2013-03-23 13:55:07 +01:00
Dane Springmeyer
f6870a6b70 correct the ltdl forward declare type 2013-03-22 19:47:57 -07:00
Hermann Kraus
290c2b4a26 Large manual merge. A lot of the changes could not be applied directly
as a different solution was used in the new branch.

Merge commit '6cbceafc45eda71ae379a3dfd7c52712ebe8422b' into harfbuzz

Conflicts:
	include/mapnik/font_engine_freetype.hpp
	src/font_engine_freetype.cpp
	src/grid/process_text_symbolizer.cpp
2013-03-23 03:00:39 +01:00
Dane Springmeyer
cc776d9553 update expected test images after fix landed for #1769 2013-03-22 18:12:19 -07:00
Dane Springmeyer
aaecd92fb6 Merge branch 'master' of github.com:mapnik/mapnik 2013-03-22 17:58:49 -07:00
Dane Springmeyer
55ec6a7942 cleanups around exception handling 2013-03-22 17:58:33 -07:00
Dane Springmeyer
f9514e5d2c formatting 2013-03-22 17:44:27 -07:00
Dane Springmeyer
3256037eb6 forward declare the lt_dlhandle type to avoid needing header in datasource_cache.hpp 2013-03-22 17:37:56 -07:00
Dane Springmeyer
dc635367b1 Merge pull request #1772 from andrzej-aa/patch-1
fixed a link to windows installation
2013-03-22 14:53:35 -07:00
Andrzej Aleksiejuk
efb5b3e33b fixed a link to windows installation 2013-03-22 22:14:36 +01:00
artemp
f96de9bdd8 + always ensure first value in gamma table to 0 2013-03-22 12:30:46 +00:00
artemp
c84d83a685 + fix raster markers positioning 2013-03-22 12:16:23 +00:00
artemp
aa122ea907 + local vars locality 2013-03-22 11:54:34 +00:00
artemp
16bfb3e728 + update FSF address 2013-03-22 08:32:08 +00:00