Commit graph

911 commits

Author SHA1 Message Date
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
5ce472cb4a Merge branch 'master' into harfbuzz 2013-03-23 15:37:36 +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
9834fb73ed Merge branch 'master' into harfbuzz 2013-03-23 14:39:04 +01:00
Hermann Kraus
cc4473cac9 Merge commit '5e224bd705b33a4574e379490a94d5063fdeaf00' into harfbuzz 2013-03-23 14:37:38 +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
cc776d9553 update expected test images after fix landed for #1769 2013-03-22 18:12:19 -07:00
Hermann Kraus
0f7101b9b5 Merge commit '71a04cd09da21680b6ad498fe4985eb157f34f35' into harfbuzz 2013-03-20 17:31:25 +01:00
Hermann Kraus
6082f3dbb2 Merge commit 'f905632b920b130bfe19dd72d81882c10e1db179' into harfbuzz 2013-03-20 17:21:04 +01:00
Hermann Kraus
03b8ee4178 Merge commit '1ed656831dc9a19cfdb67529d84d2762697a6f19' into harfbuzz
Conflicts:
	tests/visual_tests/images/expressionformat-500-reference.png
	tests/visual_tests/images/formatting-1-500-reference.png
	tests/visual_tests/images/formatting-2-500-reference.png
	tests/visual_tests/images/formatting-3-500-reference.png
	tests/visual_tests/images/jalign-auto-200-reference.png
	tests/visual_tests/images/line-offset-900-reference.png
	tests/visual_tests/images/lines-1-200-reference.png
	tests/visual_tests/images/lines-1-400-reference.png
	tests/visual_tests/images/lines-1-600-reference.png
	tests/visual_tests/images/lines-1-800-reference.png
	tests/visual_tests/images/lines-2-200-reference.png
	tests/visual_tests/images/lines-2-400-reference.png
	tests/visual_tests/images/lines-2-600-reference.png
	tests/visual_tests/images/lines-2-800-reference.png
	tests/visual_tests/images/lines-3-200-reference.png
	tests/visual_tests/images/lines-3-400-reference.png
	tests/visual_tests/images/lines-3-600-reference.png
	tests/visual_tests/images/lines-3-800-reference.png
	tests/visual_tests/images/lines-shield-200-reference.png
	tests/visual_tests/images/lines-shield-400-reference.png
	tests/visual_tests/images/lines-shield-600-reference.png
	tests/visual_tests/images/lines-shield-800-reference.png
	tests/visual_tests/images/list-100-reference.png
	tests/visual_tests/images/list-150-reference.png
	tests/visual_tests/images/list-250-reference.png
	tests/visual_tests/images/list-300-reference.png
	tests/visual_tests/images/list-400-reference.png
	tests/visual_tests/images/list-600-reference.png
	tests/visual_tests/images/list-800-reference.png
	tests/visual_tests/images/rtl-point-200-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-490-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-495-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-497-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-498-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-499-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-500-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-501-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-502-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-505-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-510-reference.png
	tests/visual_tests/images/simple-100-reference.png
	tests/visual_tests/images/simple-150-reference.png
	tests/visual_tests/images/simple-250-reference.png
	tests/visual_tests/images/simple-300-reference.png
	tests/visual_tests/images/simple-400-reference.png
	tests/visual_tests/images/simple-600-reference.png
	tests/visual_tests/images/simple-800-reference.png
	tests/visual_tests/images/simple-E-500-reference.png
	tests/visual_tests/images/simple-N-500-reference.png
	tests/visual_tests/images/simple-NE-500-reference.png
	tests/visual_tests/images/simple-NW-500-reference.png
	tests/visual_tests/images/simple-S-500-reference.png
	tests/visual_tests/images/simple-SE-500-reference.png
	tests/visual_tests/images/simple-SW-500-reference.png
	tests/visual_tests/images/simple-W-500-reference.png
	tests/visual_tests/test.py
2013-03-20 17:19:57 +01:00
Hermann Kraus
e673051de5 Reenable grid tests. 2013-03-20 17:15:36 +01:00
Hermann Kraus
9489cd5538 Add missing test cases. 2013-03-20 03:50:57 +01:00
Hermann Kraus
7d34fb489a Large merge with a lot of manual edits.
Test for grid renderer are failing atm.

Merge commit 'e66d00762754d1204204ccf122955116e5e9d017' into harfbuzz

Conflicts:
	include/mapnik/font_engine_freetype.hpp
	src/agg/process_shield_symbolizer.cpp
	src/agg/process_text_symbolizer.cpp
	src/font_engine_freetype.cpp
	src/grid/process_shield_symbolizer.cpp
	src/grid/process_text_symbolizer.cpp
	src/text_symbolizer.cpp
	src/xml_tree.cpp
2013-03-20 03:47:20 +01:00
Hermann Kraus
feaf757c07 Fix return type. 2013-03-20 03:45:33 +01:00
Dane Springmeyer
25591cfcbf replace one more cairo/halo image 2013-03-19 14:24:05 -07:00
Dane Springmeyer
fd186d1b79 fix expected cairo/text halo rendering tests after #1624 2013-03-19 14:07:30 -07:00
Hermann Kraus
16750433e2 Merge commit 'e5fd3675fab544fd34fe404425ed5287d39d9f24' into harfbuzz 2013-03-16 18:28:25 +01:00
Hermann Kraus
53320282f6 Merge commit '5e1a19cfda06382b34c8f6f6729b16a36543fc82' into harfbuzz
Conflicts:
	tests/visual_tests/test.py
2013-03-16 18:26:08 +01:00
Hermann Kraus
f11616c644 Merge commit '6ffe78c30063ed30f82b48b32c8069a7e69a6edf' into harfbuzz
Conflicts:
	tests/visual_tests/test.py
2013-03-16 18:23:17 +01:00
Hermann Kraus
346ce07117 Merge commit '88360c365f2ea288740db51e65588f839fc67bba' into harfbuzz
Conflicts:
	include/mapnik/cairo_renderer.hpp
2013-03-16 18:21:59 +01:00
Hermann Kraus
20ff37eb2d Merge commit '1454105b124daccc4d64654e11c442a2a1aa5008' into harfbuzz
Conflicts:
	src/build.py
2013-03-16 17:44:03 +01:00
Hermann Kraus
dda1f51c51 Merge commit '1b3b598b80fa5632e16b379d92d21d5e24548975' into harfbuzz 2013-03-16 17:40:23 +01:00
Hermann Kraus
ab54c30e89 Merge commit 'cf11a27a227423c8419e279666d7463adc8b1736' into harfbuzz 2013-03-16 16:29:01 +01:00
Hermann Kraus
2ea4f748a2 Merge commit 'b1c1c86346d23042377deca1644e19959b93f68d' into harfbuzz
Conflicts:
	SConstruct
2013-03-16 16:25:52 +01:00
Hermann Kraus
793ec114e9 Merge commit '95b29f82b192f3aba6ef7efa57e4ac3ccb021910' into harfbuzz 2013-03-16 16:18:46 +01:00
Hermann Kraus
4699d2d0d6 Merge commit '70008ca78188a086174b003ef965a67a6e93e79e' into harfbuzz 2013-03-16 16:07:50 +01:00
Hermann Kraus
c70f4c2c2d Merge commit 'f483e590d846513c0ddc4e464139006a3f7cd917' into harfbuzz 2013-03-16 15:49:06 +01:00
Hermann Kraus
63acf3c248 Merge commit '0121f53f56327fda1aebb9d2e6c12aee07ef3b49' into harfbuzz
Conflicts:
	include/mapnik/font_engine_freetype.hpp
2013-03-16 15:15:38 +01:00
Hermann Kraus
4484447774 Merge commit '70ef017f8ccbd2120b02fc7556808e541bc479a5' into harfbuzz 2013-03-16 13:35:21 +01:00
Hermann Kraus
25d00ad26f Merge commit '32760318a4905efa45bb459d891e5e7ec1a7bf2a' into harfbuzz
Conflicts:
	include/mapnik/font_engine_freetype.hpp
	include/mapnik/text/formatting/base.hpp
	include/mapnik/text/formatting/list.hpp
	include/mapnik/text/text_properties.hpp
	src/font_engine_freetype.cpp
	src/grid/process_shield_symbolizer.cpp
	src/symbolizer_helpers.cpp
	src/text/formatting/expression.cpp
	src/text/formatting/format.cpp
	src/text/formatting/list.cpp
	src/text/text_properties.cpp
2013-03-16 13:19:06 +01:00
Hermann Kraus
fe54e4a6a1 Merge commit '6b7c16297032aa24bab0950b2a837e58c7d52c86' into harfbuzz
Conflicts:
	src/grid/process_shield_symbolizer.cpp
2013-03-16 13:13:14 +01:00
Hermann Kraus
438e2c4de7 Merge commit 'bb27156df0a111fdecfe87b48d27b2866b7a2816' into harfbuzz
Conflicts:
	include/mapnik/font_engine_freetype.hpp
	include/mapnik/grid/grid_renderer.hpp
	include/mapnik/placement_finder.hpp
	include/mapnik/processed_text.hpp
	include/mapnik/text/formatting/registry.hpp
	include/mapnik/text/placements/registry.hpp
	include/mapnik/text_path.hpp
2013-03-16 13:11:29 +01:00
Hermann Kraus
77fadc8209 Merge commit '562fada9d0f680f59b2d9f396c95320a0d753479' into harfbuzz 2013-03-16 13:03:11 +01:00
Hermann Kraus
4a6eab2d85 Merge commit 'c0021d0760ec85ace3b0a9a480d351cfd0f0ce91' into harfbuzz
Conflicts:
	include/mapnik/font_engine_freetype.hpp
2013-03-16 13:01:15 +01:00
Hermann Kraus
90f0287a21 Merge commit '95ceee84fac2cd9dffad0931889522a87c723537' into harfbuzz
Conflicts:
	src/cairo_renderer.cpp
2013-03-16 12:59:07 +01:00
Hermann Kraus
a2aaea1cd0 Merge commit '1d114b5e2fd4b5f9cd64013d3eec89fd00d580a5' into harfbuzz 2013-03-16 12:47:52 +01:00
Hermann Kraus
df7c2b5c0e Merge commit '57aa6dd05230876bf7c022d3554436e4d35de77f' into harfbuzz
Conflicts:
	tests/visual_tests/test.py
2013-03-16 12:46:01 +01:00
Hermann Kraus
4d54696265 Merge commit '8dca9dbb2b9012caf9d37ae60906756aa6c0e037' into harfbuzz
Conflicts:
	src/agg/process_shield_symbolizer.cpp
	src/grid/process_shield_symbolizer.cpp
2013-03-16 12:44:46 +01:00
Hermann Kraus
0c62b481f6 Merge commit 'cd064305fc8cf7fee1806e495d9016a5ce1e5d7f' into harfbuzz
Conflicts:
	src/cairo_renderer.cpp
2013-03-16 12:44:01 +01:00
Hermann Kraus
a9973837ef Merge commit '0b9ebe21dd593b9b87c6388291b79a5c5a4af4e4' into harfbuzz
Conflicts:
	tests/visual_tests/test.py
2013-03-16 12:39:47 +01:00
Hermann Kraus
ad905f1ff8 Merge commit '00517a507f68237874630dae1821c8a2c844bc3d' into harfbuzz
Conflicts:
	tests/visual_tests/test.py
2013-03-16 12:34:59 +01:00
Hermann Kraus
c4cdd89076 Merge commit 'b9b97ba6526aebbe920e0bd29b8dc8dc35267cfc' into harfbuzz
Conflicts:
	src/load_map.cpp
2013-03-16 12:31:56 +01:00
Hermann Kraus
d522d997e8 Merge commit '4432b75f53b30d02ecf5add1e84f6b78cd572f98' into harfbuzz
Conflicts:
	tests/visual_tests/test.py
2013-03-16 12:28:15 +01:00
Hermann Kraus
606361b75c Merge commit '940bb9827585885c6eaef9b1d4c62a38f4e81ea9' into harfbuzz
Conflicts:
	tests/visual_tests/test.py
2013-03-16 12:21:31 +01:00
Hermann Kraus
3ea335af66 Merge commit '7cf4a00af9530ba2aa46ba1a4a5cb2cb41fe166a' into harfbuzz 2013-03-16 12:13:11 +01:00
artemp
bdf3c59a2c + disable failing clipping tests pending different impl 2013-03-15 12:51:31 +00:00
Dane Springmeyer
11e825a045 formatting 2013-03-14 18:33:59 -07:00
Dane Springmeyer
2b3170322d remove not yet implemented flag 2013-03-14 17:01:57 -07:00