Commit graph

146 commits

Author SHA1 Message Date
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
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
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
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
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
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
4c66d6dda0 fix raster resampling bug - closes #1489 and fixes mapbox/tilemill#1888 2013-01-31 18:43:06 -05: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
d0b7eb401e tweak test image 2013-01-17 13:18:10 -08:00
Dane Springmeyer
6a2f562925 lessen comparison strictness between agg and cairo outputs to enable new marker-online-spacing tests to pass 2013-01-08 18:51:31 -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
c31c4e77f1 improve quiet output for visual tests 2012-12-06 20:14:14 -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
bf33e0eaa5 pretty print expected json grids in visual tests 2012-11-29 18:02:38 -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
c95b8ff8d7 fix visual tests by restoring old hack to prevent rendering of all names 2012-11-27 18:15:56 -08:00
Dane Springmeyer
5fb3949d91 update expected grid results after #1584/4efb6ea 2012-11-21 19:26:05 -08:00
Dane Springmeyer
71cca6999a add missing test file 2012-11-20 18:07:51 -08:00
Dane Springmeyer
8ad538d03c add missing test file 2012-11-20 18:07:12 -08:00
Dane Springmeyer
f39c3ad857 add marker-multi-policy parameter to support user-configurable rendering behavior for multi-geometries when using either point or interior placement - closes #1573, refs #1555 2012-11-20 17:58:39 -08:00
Dane Springmeyer
0b3ab12da7 fix missing variable 2012-11-20 15:40:35 -08:00
Dane Springmeyer
ff933fb033 only generate reference images on the fly for agg (not cairo) since we want to compare cairo to agg reference 2012-11-20 15:29:26 -08:00
Dane Springmeyer
3ce7ae7fc9 visual test improvements: comment non-critical raster-tiff tests, start testing grids, and ignore alpha when comparing agg output to cairo 2012-11-20 15:08:53 -08:00
Hermann Kraus
c739dc2133 Fix reference to old data file.
Closes #1513.
2012-10-06 00:40:54 +02:00
Dane Springmeyer
bfdd9dcb00 also start testing/comparing cairo png output in visual tests 2012-10-02 21:18:45 -07:00
Dane Springmeyer
f635a2bd1e fix expected images for gdal/raster opaque edge test 2012-10-02 14:11:28 -07: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
76dec5076e fix up expected results for testcases being developed for #1508 2012-09-28 11:19:20 -07:00
Dane Springmeyer
446ef47242 Add test file 2012-09-27 19:24:02 -07:00
Dane Springmeyer
8135ac8ac1 add more color to the visual test output 2012-09-27 19:18:07 -07:00
Dane Springmeyer
a7670459d6 add testcase for #1508 to visual tests 2012-09-27 19:11:11 -07:00