Commit graph

59 commits

Author SHA1 Message Date
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
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
dda1f51c51 Merge commit '1b3b598b80fa5632e16b379d92d21d5e24548975' into harfbuzz 2013-03-16 17:40:23 +01:00
Hermann Kraus
793ec114e9 Merge commit '95b29f82b192f3aba6ef7efa57e4ac3ccb021910' into harfbuzz 2013-03-16 16:18:46 +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
fe54e4a6a1 Merge commit '6b7c16297032aa24bab0950b2a837e58c7d52c86' into harfbuzz
Conflicts:
	src/grid/process_shield_symbolizer.cpp
2013-03-16 13:13:14 +01:00
Hermann Kraus
77fadc8209 Merge commit '562fada9d0f680f59b2d9f396c95320a0d753479' into harfbuzz 2013-03-16 13:03:11 +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
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
d522d997e8 Merge commit '4432b75f53b30d02ecf5add1e84f6b78cd572f98' into harfbuzz
Conflicts:
	tests/visual_tests/test.py
2013-03-16 12:28:15 +01:00
Dane Springmeyer
f905632b92 visual testcase for #1744 2013-03-11 15:09:04 -07:00
Dane Springmeyer
1ed656831d start testing scale_factor - overwrite all expected results 2013-03-11 13:36:31 -07:00
Dane Springmeyer
c36795e0a9 respect both sx and sy in setting up affine transform for raster scaling since they may be different - closes #1748 2013-03-06 17:41:20 -08:00
Dane Springmeyer
4922f76858 visual tests - stop testing agg v cairo and rather cairo v cairo - add test for #1600 2013-03-06 11:32:27 -08:00
Dane Springmeyer
c184579c43 finish hsla transformation image-filter 2013-02-28 12:19:40 -05:00
Dane Springmeyer
12dfcef3a0 add support for background-image to cairo_renderer and refactor into setup function to match agg/grid renderers - closes #1724 2013-02-20 17:55:53 -08:00
Dane Springmeyer
523f00c34f add testcase for broken premultiplied alpha in resampling - refs #1489 and mapbox/tilemill#1888 2013-01-31 18:37:01 -05:00
Dane Springmeyer
ae5f4d26d1 tests: make consistent the proj4 string for epsg:4326 2013-01-25 00:49:55 -08:00
Dane Springmeyer
cc431505e0 fix #1487 (marker placement when spacing < width) and add tests 2013-01-04 13:42:13 -08:00
Dane Springmeyer
900774f2a7 add a visual test for label line placement collision 2012-12-20 17:27:09 -08:00
Dane Springmeyer
18a0521676 add a visual test for marker middle point placement on lines - refs #1604 2012-12-10 15:55:13 -08:00
Dane Springmeyer
7d408d523c close #1548 with explict handling of point geometries and amend 629d768eae for cairo/grid renderers to ensure proper placement on lines (refs #1604,#1350,#1607) 2012-12-02 19:53:44 -08:00
Dane Springmeyer
6d1dec63c7 Merge pull request #1615 from strk/master-fix-marker-multi-policy-test
Fix marker-multi-policy test. Closes #1612
2012-11-29 17:57:01 -08:00
Sandro Santilli
54d75d946b Fix "whole" multi centroid computation
Includes testcase.
Closes #1606
2012-11-29 17:55:13 +01:00
Sandro Santilli
60e3f81331 Fix marker-multi-policy test. Closes #1612 2012-11-29 15:00:26 +01:00
Dane Springmeyer
8ad538d03c add missing test file 2012-11-20 18:07:12 -08:00
Dane Springmeyer
798b101f0c finish #1512 and adjust tests to use new parameter 2012-10-01 17:09:28 -07:00
Dane Springmeyer
67d8ee3d40 point tests at better source files for #1508 2012-10-01 15:05:07 -07:00
Dane Springmeyer
2714bdcef3 more test fixes to set up to enforce desired behavior around tiff and premultiplied alpha in source files - refs #1508 and #1511 2012-09-28 15:07:33 -07:00
Dane Springmeyer
a7670459d6 add testcase for #1508 to visual tests 2012-09-27 19:11:11 -07:00
Dane Springmeyer
794f5e369a start moving raster visual tests into place (add new,currently failing tests for raster.input) 2012-09-26 12:01:28 -07:00
Hermann Kraus
dc6ecc4be7 Reenable wrap-before and add tests for it. 2012-09-14 18:53:52 +02:00
Hermann Kraus
6d9c808b6d Fix all reference to points.shp.
Add new character spacing test.
2012-09-13 23:35:42 +02:00
Hermann Kraus
85e075b8ea Merge branch 'master' into harfbuzz
Conflicts:
	bindings/python/mapnik_text_placement.cpp
	include/mapnik/font_engine_freetype.hpp
	include/mapnik/map.hpp
	include/mapnik/metawriter.hpp
	include/mapnik/metawriter_inmem.hpp
	include/mapnik/metawriter_json.hpp
	include/mapnik/placement_finder.hpp
	include/mapnik/symbolizer.hpp
	include/mapnik/symbolizer_helpers.hpp
	include/mapnik/text_properties.hpp
	src/agg/process_shield_symbolizer.cpp
	src/build.py
	src/cairo_renderer.cpp
	src/feature_style_processor.cpp
	src/grid/process_shield_symbolizer.cpp
	src/metawriter.cpp
	src/metawriter_inmem.cpp
	src/placement_finder.cpp
	src/processed_text.cpp
	src/symbolizer_helpers.cpp
	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/styles/formatting.xml
	tests/visual_tests/test.py
2012-09-07 19:07:31 +02:00
Dane Springmeyer
0e0cd08ccb ensure opacity naming fix works - closes #1470 2012-09-04 13:30:24 -07:00
Dane Springmeyer
d133db55f6 remove unused style 2012-09-04 13:21:40 -07:00
Hermann Kraus
c8eb8e5775 Switch tests from shapefile to osm.
Closes #1121.
2012-08-22 00:06:26 +02:00
Hermann Kraus
a1f0af112e Support ShieldSymbolizer. 2012-08-17 18:31:55 +02:00
Hermann Kraus
f72527da8b Add tests. 2012-08-17 01:56:43 +02:00
Hermann Kraus
2a0a52fba2 Update tests. 2012-08-12 15:30:54 +02:00
Hermann Kraus
c529bf7b06 Implement font sets. 2012-08-02 01:12:52 +02:00
Hermann Kraus
f2e2483109 Better text positions. 2012-08-01 23:09:47 +02:00
Hermann Kraus
5929c3c9db Add "rotate-displacement". 2012-07-31 23:05:31 +02:00
Hermann Kraus
a41eafd8ee Add rotation tests. 2012-07-30 18:06:06 +02:00
Hermann Kraus
a57123f8be Add collision detector support. 2012-07-30 02:17:43 +02:00