Commit graph

392 commits

Author SHA1 Message Date
Dane Springmeyer
0f4ba4dfd5 sync with 2.3.x branch 2013-09-25 20:04:31 -07:00
Dane Springmeyer
09544849b9 move colorizer tests to visual suite 2013-09-25 14:08:47 -07:00
Dane Springmeyer
8d79008e9e move over other colortable test to visual tests 2013-09-25 14:02:52 -07:00
Dane Springmeyer
0ffb9ef308 Merge branch '2.3.x' of github.com:mapnik/mapnik 2013-09-25 13:14:01 -07:00
Dane Springmeyer
cb80fb8226 move/expand gdal nodata tests to visual suite - refs #2023 2013-09-25 13:13:18 -07:00
Dane Springmeyer
681f8853d3 pull in changes from master 2013-09-24 22:57:01 -07:00
Dane Springmeyer
8ca8b2c64e fix winding order, allowing boost::polygon clipper to return exterior/interior rings correctly 2013-09-24 15:24:18 -07:00
Dane Springmeyer
f05b727bf5 fix dst-over alpha handling - closes #1995 - refs #1452 and 5e84ce0 2013-09-20 13:37:34 -07:00
Dane Springmeyer
da226a48cf add test data for #1995 2013-09-20 13:35:54 -07:00
Dane Springmeyer
4713ddf8d6 reduced testcase for #1995 - refs #1452 and #1369 2013-09-20 13:31:11 -07:00
Dane Springmeyer
9df4deac73 consistent use of agg::rgba8_pre to construct premultiplied colors - refs #2011 2013-09-19 19:41:46 -07:00
Dane Springmeyer
5b78b6b2dc fix #2011 2013-09-19 19:19:11 -07:00
Dane Springmeyer
d054d47884 Add new test images - refs #2011 2013-09-19 19:16:46 -07:00
Dane Springmeyer
2ccbdb101c add testcase for building fill-opacity premultiplied alpha bug - refs #2011 2013-09-19 19:15:32 -07:00
Dane Springmeyer
f058a481b7 minor whitespace fixes 2013-09-18 19:55:02 -07:00
Dane Springmeyer
c5dd5487a5 Merge pull request #1966 from mapnik/background-image-comp-op
Map background-image-comp-op and background-image-opacity
2013-09-05 12:25:47 -07:00
Petr Dlouhý
edf170c428 LinePatternSymbolizer visual test 2013-08-22 12:55:56 +02:00
Dane Springmeyer
13343eb5be workaround c++11 compile error due to ambiguous std::vector::insert usage - closes #1973 2013-07-30 15:14:47 -04:00
Dane Springmeyer
2ea353bce0 test_python.py was still broken - actually fix it - refs #1513 2013-07-30 14:31:29 -04:00
Dane Springmeyer
fad9af5263 add support for applying custom comp_op and opacity when blending map background image into background color at render time - refs mapnik/mapnik-support#8 2013-07-25 01:00:38 -04:00
Dane Springmeyer
0ac9c7f4c9 re-write scale-hsla filter to work in doubles, allowing proper clamping at the right time - refs #1954 2013-07-24 21:13:46 -04:00
Dane Springmeyer
eaeccc3c3a enforce valid hsla values - refs #1954 2013-07-24 14:24:33 -04:00
Dane Springmeyer
32464c5a4b Add expected test images 2013-07-23 20:02:37 -04:00
Dane Springmeyer
e24b894868 add regression test for #1952 2013-07-23 20:00:42 -04:00
Dane Springmeyer
ef4dfeb747 make it possible to disable compilation of grid_renderer - closes #1962 2013-07-23 19:37:25 -04:00
Dane Springmeyer
a6a16304cc regression test for gdal filter-factor 2013-07-19 18:56:50 -04:00
Dane Springmeyer
4f2e1993bf tests: add a pseudo-tiled test for preventing regression of #1477 2013-07-19 16:07:12 -04:00
Dane Springmeyer
db39528231 disable failing test of #1913 for now 2013-07-19 00:39:22 -04:00
Dane Springmeyer
0872061993 renable hsla filter as 'scale-hsla' - refs #1954 2013-07-19 00:37:51 -04:00
Dane Springmeyer
23c5b0f2f7 add test data as followup to 87a2787a40 - refs #916 2013-07-19 00:28:20 -04:00
Dane Springmeyer
87a2787a40 add visual tests for group-by feature - refs #916 2013-07-18 18:35:14 -04:00
Dane Springmeyer
26af45c40c Add a few expected images 2013-07-12 20:31:32 -04:00
Dane Springmeyer
ef537ac0f3 Accept a few changes to visual test xml via harfbuzz branch - refs #1950 2013-07-12 20:30:56 -04:00
Dane Springmeyer
86bc7d6c11 fix svg parser to ignore empty groups - closes #1944 2013-07-10 17:25:34 -04:00
Dane Springmeyer
022dd43834 add testcase for #1944 2013-07-10 17:23:17 -04:00
Dane Springmeyer
63a06a9aab fix handling of opacity when rendering svg with cairo - closes #1943 2013-07-10 16:19:28 -04:00
AJ Ashton
6814834892 Add test for translating geometries 2013-06-28 17:22:31 -04:00
Dane Springmeyer
36814bcb2e add expected (currently failing) test for #1931 2013-06-28 15:03:55 -04:00
Dane Springmeyer
98d21de168 add currently failing test for #1913 2013-06-13 20:20:03 -07:00
Dane Springmeyer
df6e9685d6 add visual test to ensure that #1501 does not regress 2013-06-13 20:09:24 -07:00
Dane Springmeyer
9d15a2c87d show exceptions at end of run for tests that could not be run 2013-06-03 14:00:51 -07:00
Dane Springmeyer
592d73a3f3 poor man's solution to #1868 2013-05-31 14:03:53 -07:00
Dane Springmeyer
dfec39224b renable cairo visual tests if cairo is installed 2013-05-22 15:42:28 -07:00
Dane Springmeyer
4ba061f506 higher threshold for difference between cairo visual tests 2013-05-22 15:10:19 -07:00
Dane Springmeyer
1e6e587d60 support running tests without any plugins built 2013-05-21 20:27:00 -07:00
Dane Springmeyer
a2266f4feb overwrite all trivially failing cairo visual tests from os 10.8 (cairo 1.12.4 / freetype 2.4.11) 2013-05-21 08:46:07 -07:00
Dane Springmeyer
018bdc4f6d fix interplay of point symbolizer/cairo/scale_factor 2013-05-21 08:46:07 -07:00
Dane Springmeyer
b2fc3d7d57 update expected grid outputs 2013-05-21 08:46:07 -07:00
Dane Springmeyer
1d77a3c3c4 finish removal of osm plugin from visual tests 2013-05-21 08:46:06 -07:00
Dane Springmeyer
f06b465cf9 further convert visual tests to use csv plugin over osm 2013-05-21 08:46:06 -07:00
Dane Springmeyer
be31f7ea18 Start moving visual test usage from osm to csv plugin 2013-05-21 08:46:06 -07:00
Dane Springmeyer
866320be14 line clipping drops points so filter osm data to ensure only lines are being used in test 2013-05-21 08:46:05 -07:00
Dane Springmeyer
dee252eb88 ignore grids in html error output 2013-05-21 08:46:05 -07:00
Dane Springmeyer
24e9dd7b6c make visual test failure comparison work with relative image paths 2013-05-20 15:07:20 -07:00
Dane Springmeyer
665b0ef555 raise cairo visual test diff above 0 2013-05-20 13:02:17 -07:00
Dane Springmeyer
c1e94120f9 add more expected test files 2013-05-20 12:50:26 -07:00
Dane Springmeyer
c901f8b46e tests for 1849 2013-05-20 12:50:26 -07:00
Dane Springmeyer
2e89e17687 first pass on an html report to view failures 2013-05-17 16:46:42 -07:00
Dane Springmeyer
6af84da0ef update out of date cairo reference images - refs #1781 2013-05-17 15:34:33 -07:00
Dane Springmeyer
f665bcb11e xadd expected cairo outputs for lines-shield test (via ubuntu precise) 2013-05-16 20:25:16 +00:00
Dane Springmeyer
71870a47b5 renable lines-shield test and always generate missing reference images - closes #1696 2013-05-16 13:17:48 -07:00
Dane Springmeyer
1c03b9fefa update expected grid test 2013-05-16 10:17:26 -07:00
Dane Springmeyer
3436c324e8 only run cairo visual rendering tests if cairo backend is available 2013-05-16 10:16:51 -07:00
Hermann Kraus
38b95a12e7 Reenable Cairo and grid tests. 2013-05-15 11:31:32 +03:00
Hermann Kraus
24913c4759 Merge pull request #1781 from mapnik/subpixelhalo
Render halos < 1.0 with fast halo algorithm.
2013-04-24 16:23:39 -07:00
Dane Springmeyer
8c2d314413 fix visual test reporting to show test that could not be run rather than just 0 2013-04-17 15:33:31 -07:00
Dane Springmeyer
294b10229e disable the hsla image-filter - not yet ready for primetime 2013-04-16 19:09:40 -07:00
Hermann Kraus
522c6b6ec3 Updated reference images. 2013-04-03 02:34:05 +02:00
Hermann Kraus
aab332b2cf More tests. 2013-04-03 02:22:07 +02:00
Hermann Kraus
7ae510414e Update reference image. 2013-03-30 02:53:50 +01:00
Dane Springmeyer
ab5f5afdd5 fix expected point symbolizer rendering tests after fe526fd3d6 2013-03-25 13:38:14 -07: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
Dane Springmeyer
cc776d9553 update expected test images after fix landed for #1769 2013-03-22 18:12:19 -07:00
Hermann Kraus
feaf757c07 Fix return type. 2013-03-20 03:45:33 +01:00
Dane Springmeyer
fd186d1b79 fix expected cairo/text halo rendering tests after #1624 2013-03-19 14:07:30 -07: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
e66d007627 add halo-rasterizer option for text symbolizer
- closes #1298
  - allows for much faster halo drawing and simliar quality for
    radius values in the 1-2 px range
  - also moves grid_renderer away from using freetype stroker completely
    since halo quality is not critical for this renderer
2013-03-08 20:32:39 -08:00
Dane Springmeyer
e5fd3675fa return 9999 for diff of failed grid comparison 2013-03-08 20:28:32 -08:00
Dane Springmeyer
5e1a19cfda update expected cairo rasters 2013-03-07 17:19:11 -08:00
Dane Springmeyer
b5e8129535 flag to overwrite expected visual test output 2013-03-07 17:19:00 -08:00
Dane Springmeyer
198dbcd4ca fix raster alignment post #1748 2013-03-06 17:53:13 -08: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
7a4b4a5d53 disable the mysteriously failing line-shields test - refs #1696 2013-03-06 11:33: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
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
Dane Springmeyer
43ded34222 visual tests: don't output debug by default and handle exceptions from rendering 2012-09-27 18:58:50 -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
Dane Springmeyer
940bb98275 visual tests: actually default to m.zoom_all() 2012-09-26 11:28:23 -07:00
Dane Springmeyer
7cf4a00af9 add ability to generate expected test results on the fly 2012-09-26 11:27:25 -07:00
Hermann Kraus
0744362481 Fix tests broken by a513d3f97d. 2012-09-08 00:43:32 +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
Dane Springmeyer
f431193a90 update test images 2012-08-22 14:49:10 -07:00
Hermann Kraus
c8eb8e5775 Switch tests from shapefile to osm.
Closes #1121.
2012-08-22 00:06:26 +02:00
Dane Springmeyer
af413aa959 conditionally run tests based on availability of datasources 2012-08-15 19:22:47 -07:00
Hermann Kraus
5fedfc8a52 Fix problem with python tests. 2012-07-30 01:25:21 +02:00
Hermann Kraus
19ed8718a3 Fix test crashes when reference image doesn't exists.
Refs #1296 and commit 269569250c
2012-07-29 01:47:16 +02:00
Dane Springmeyer
269569250c use mapnik.Image for visual tests - closes #1296 2012-07-06 17:44:15 -07:00
Hermann Kraus
c805cbcfe1 Add test for ShieldSymbolizer with text placements. 2012-07-05 10:37:39 +02:00
Hermann Kraus
eb682c1f4f Fix visual_tests/test.py. 2012-07-03 23:39:34 +02:00
Dane Springmeyer
b8e0366fdf improve readibility of error output from visual tests 2012-06-07 15:26:50 -05:00
Dane Springmeyer
66ff9b1492 show expected image path for visual test failures 2012-04-23 16:13:59 -07:00
Dane Springmeyer
e3982081d8 save test renders outside of source tree 2012-04-16 22:07:14 -07:00
Dane Springmeyer
0e64cc157e tests: allow the visual tests to be run in quiet mode 2012-04-04 14:54:07 -07:00
Dane Springmeyer
e570ea3a98 hook up visual tests to the 'make test' target 2012-03-23 12:42:11 -07:00
Hermann Kraus
620f3f943e Add reference image. 2012-03-20 23:52:13 +01:00
Hermann Kraus
eac133952c Add line-offset test. 2012-03-20 23:13:15 +01:00
Hermann Kraus
eb911deca5 Change visual tests config format. 2012-03-20 23:13:15 +01:00
Hermann Kraus
fe2879ac42 Update python tests. 2012-03-20 23:13:15 +01:00
Hermann Kraus
f7a387f8af Change visual tests directory structure. 2012-03-20 23:13:15 +01:00
Hermann Kraus
9b62a19cf4 Implement justify-alignment=auto.
Closes #1125.
2012-03-19 17:12:53 +01:00
Hermann Kraus
ff78217276 Add reference image for RTL test. 2012-03-16 01:51:19 +01:00
Hermann Kraus
f9b2e5fb56 Add test for RTL text. 2012-03-16 00:38:03 +01:00
Hermann Kraus
2b68cea0a1 Merge branch 'new-xml'
Conflicts:
	include/mapnik/config_error.hpp
	include/mapnik/ptree_helpers.hpp
	src/formatting/text.cpp
	src/libxml2_loader.cpp
	src/load_map.cpp
	src/metawriter_factory.cpp
	src/text_placements/registry.cpp
	src/text_placements/simple.cpp
2012-03-13 11:11:28 +01:00
Hermann Kraus
502773bea6 Only one grammar object per XML tree. 2012-03-11 23:24:28 +01:00
Dane Springmeyer
c5c0f92247 save the maps in the right place for visual tests 2012-03-08 17:04:51 -08:00
Dane Springmeyer
9fb45ebf75 allow visual tests to be run from root 2012-03-08 17:01:51 -08:00
Hermann Kraus
cd8cfc6527 Improve error messages. 2012-03-08 18:52:53 +01:00
Hermann Kraus
8b0b9ed5fe Handle different image sizes correctly. 2012-03-08 18:29:46 +01:00
Hermann Kraus
7d3fd0755d Complete XML changes in load_map.cpp 2012-03-07 01:35:37 +01:00
Hermann Kraus
b5e1ebfac8 New reference images. 2012-03-04 02:06:03 +01:00
Hermann Kraus
0eece15f62 New tests. 2012-03-04 02:04:43 +01:00
Hermann Kraus
586cdff6e8 Add new test. 2012-03-03 16:32:31 +01:00
Hermann Kraus
0ef573c197 Avoid accidential uploading of test file to OSM server. 2012-03-03 16:31:49 +01:00
Hermann Kraus
c47eb3642a Reformat test and extend to verify text is centered correctly. 2012-03-03 13:53:08 +01:00
Hermann Kraus
1fcfbaac52 Add test for TextSymbolizer line placement. 2012-03-02 01:45:44 +01:00
Dane Springmeyer
0a37a1591e fixup whitespace with pep8 tricks from https://gist.github.com/1903033 2012-02-24 13:13:56 -08:00
Hermann Kraus
0759d1b0dc Update reference images. 2012-02-21 00:06:54 +01:00
Hermann Kraus
73339b3936 Render ShieldSymbolizer tests with varying width. Triggers the problem in #1078.
Update script to handle case when no reference image is found.
2012-02-20 17:45:47 +01:00
Hermann Kraus
6fe0637425 Complete support for formatting types. 2012-02-19 02:03:25 +01:00
Hermann Kraus
76cdd7a254 Merge branch 'master' into python-textplacement 2012-02-19 01:00:52 +01:00
Hermann Kraus
d56f05b4ec Move compare() to own file.
Increase threshold.
2012-02-18 17:51:18 +01:00
Hermann Kraus
0ba24d7480 Simply clean script. 2012-02-18 17:29:48 +01:00
Hermann Kraus
e0f6474d9b Merge commit '95aa6904dfde5732fd330752efaf4fbc15105651' from ramunasd/master
Conflicts:
	tests/visual_tests/shieldsymbolizer-1-500-reference.png
	tests/visual_tests/shieldsymbolizer-1.xml
2012-02-18 17:21:02 +01:00
Hermann Kraus
b449cb5e6d Add correct reference image. 2012-02-18 16:46:36 +01:00
Hermann Kraus
f4ec936202 Improve test case again. 2012-02-18 16:45:35 +01:00
Hermann Kraus
db168a0db7 Update test case. 2012-02-18 13:06:25 +01:00
Hermann Kraus
665f0a51a0 Remove old reference image. 2012-02-18 01:24:00 +01:00
Hermann Kraus
0814824b35 Use uppercase letters. 2012-02-18 01:23:25 +01:00
Hermann Kraus
212171b9ee Add visual test for ShieldSymbolizer. 2012-02-18 01:17:29 +01:00
Ramunas
95aa6904df compute image difference & update reference images 2012-02-18 00:19:07 +02:00
Hermann Kraus
53fa19af5a Update test. 2012-02-17 21:00:40 +01:00
Hermann Kraus
ceda45249f Merge branch 'master' into python-textplacement 2012-02-16 00:18:44 +01:00
Hermann Kraus
4602338e0c Add ExpressionFormat: Allow changing text format based on expressions.
Closes #1036.
Refs #1048.
2012-02-15 21:38:24 +01:00
Hermann Kraus
86d32afac5 Add string constructor for text node. 2012-02-12 01:49:54 +01:00
Hermann Kraus
c94d32b41b Add bindings for formating::list_node. 2012-02-11 11:21:33 +01:00
Hermann Kraus
3cafd214de New test case. 2012-02-05 21:32:03 +01:00
Hermann Kraus
a47019ac7b Better tests.
Reference images.
2012-02-05 16:29:27 +01:00
Hermann Kraus
37b2054041 Copy constructor for CharProperties. 2012-02-05 15:11:08 +01:00
Hermann Kraus
099ec85da6 Implement add_expression and helper classes.
Update test.
2012-02-05 04:09:09 +01:00
Hermann Kraus
4230c72fd6 Test case for python bindings. 2012-02-05 01:48:25 +01:00
Artem Pavlenko
b90de4874c Merge branch 'textplacement-merge' into feature-text-merge
Conflicts:
	docs/textrendering.gv
	include/mapnik/building_symbolizer.hpp
	include/mapnik/placement_finder.hpp
	include/mapnik/symbolizer_helpers.hpp
	include/mapnik/text_placements.hpp
	include/mapnik/text_placements_list.hpp
	include/mapnik/text_placements_simple.hpp
	include/mapnik/text_processing.hpp
	plugins/input/shape/shape_utils.hpp
	src/agg/process_shield_symbolizer.cpp
	src/agg/process_text_symbolizer.cpp
	src/cairo_renderer.cpp
	src/grid/process_shield_symbolizer.cpp
	src/grid/process_text_symbolizer.cpp
	src/load_map.cpp
	src/placement_finder.cpp
	src/shield_symbolizer.cpp
	src/text_placements.cpp
	src/text_processing.cpp
	src/text_symbolizer.cpp
	tests/visual_tests/clean.sh
	tests/visual_tests/test.py

Merge herm/textplacement-merge
2012-01-31 11:09:55 +00:00
Hermann Kraus
e564b00370 New test. 2012-01-29 05:11:59 +01:00
Hermann Kraus
604b8db016 Update tests. 2012-01-27 23:15:12 +01:00
Hermann Kraus
92ca0b74ed Update clean.sh. 2012-01-27 23:15:12 +01:00
Artem Pavlenko
d1f16bb227 merge textplacement-merge into feature_impl 2012-01-26 13:04:08 +00:00
Hermann Kraus
51d8718701 Move tests to new location. 2012-01-25 23:31:07 +01:00