Dane Springmeyer 39737c5f1d Merge branch '2.3.x' of github.com:mapnik/mapnik ... Conflicts: .travis.yml CHANGELOG.md bindings/python/build.py include/mapnik/feature_style_processor_context.hpp include/mapnik/feature_style_processor_impl.hpp include/mapnik/json/feature_collection_grammar.hpp include/mapnik/json/feature_collection_parser.hpp include/mapnik/json/feature_generator_grammar.hpp include/mapnik/json/feature_parser.hpp include/mapnik/json/geojson_generator.hpp include/mapnik/json/geometry_generator_grammar.hpp include/mapnik/json/geometry_parser.hpp plugins/input/gdal/gdal_featureset.cpp plugins/input/geojson/geojson_datasource.cpp plugins/input/occi/occi_featureset.cpp plugins/input/osm/osm_featureset.cpp plugins/input/postgis/build.py plugins/input/postgis/connection.hpp src/agg/agg_renderer.cpp src/build.py src/cairo_context.cpp src/datasource_cache.cpp src/grid/process_line_symbolizer.cpp src/grid/process_polygon_pattern_symbolizer.cpp src/grid/process_polygon_symbolizer.cpp src/grid/process_text_symbolizer.cpp src/json/feature_grammar.cpp tests/cpp_tests/fontset_runtime_test.cpp tests/visual_tests/images/collision-600-400-1.0-agg-reference.png tests/visual_tests/images/image-filters-multi-blur-512-512-1.0-agg-reference.png tests/visual_tests/images/image-filters-multi-blur-512-512-2.0-agg-reference.png tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-1.0-agg-reference.png tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-2.0-agg-reference.png tests/visual_tests/images/lines-1-400-400-2.0-agg-reference.png tests/visual_tests/images/lines-1-600-600-1.0-agg-reference.png tests/visual_tests/images/lines-1-600-600-2.0-agg-reference.png tests/visual_tests/images/lines-2-200-200-1.0-agg-reference.png tests/visual_tests/images/lines-2-400-400-1.0-cairo-reference.png tests/visual_tests/images/lines-2-400-400-2.0-agg-reference.png tests/visual_tests/images/lines-2-600-600-2.0-agg-reference.png tests/visual_tests/images/lines-2-800-800-2.0-agg-reference.png tests/visual_tests/images/lines-3-400-400-2.0-agg-reference.png tests/visual_tests/images/lines-3-600-600-1.0-agg-reference.png tests/visual_tests/images/lines-3-600-600-2.0-agg-reference.png tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png tests/visual_tests/images/lines-6-200-200-1.0-agg-reference.png tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png tests/visual_tests/images/lines-6-400-400-1.0-agg-reference.png tests/visual_tests/images/lines-6-600-600-1.0-agg-reference.png tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png tests/visual_tests/images/lines-6-800-800-1.0-agg-reference.png tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png tests/visual_tests/images/lines-shield-600-600-2.0-agg-reference.png tests/visual_tests/images/lines-shield-600-600-2.0-cairo-reference.png tests/visual_tests/images/shield-on-polygon-600-400-1.0-agg-reference.png tests/visual_tests/images/shield-on-polygon-600-400-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-1-490-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-cairo-reference.png tests/visual_tests/images/shieldsymbolizer-1-497-100-1.0-cairo-reference.png tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-cairo-reference.png tests/visual_tests/images/shieldsymbolizer-1-498-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-1-499-100-1.0-cairo-reference.png tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-cairo-reference.png tests/visual_tests/images/shieldsymbolizer-1-500-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-1-501-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-1-502-100-1.0-cairo-reference.png tests/visual_tests/images/shieldsymbolizer-1-502-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-cairo-reference.png tests/visual_tests/images/shieldsymbolizer-1-510-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-3-490-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-3-495-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-3-497-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-3-498-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-3-499-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-3-500-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-3-501-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-3-502-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-3-505-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-3-510-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-4-490-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-4-495-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-4-497-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-4-498-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-4-499-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-4-500-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-4-501-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-4-502-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-4-505-100-2.0-agg-reference.png tests/visual_tests/images/shieldsymbolizer-4-510-100-2.0-agg-reference.png tests/visual_tests/test.py		2014-04-24 14:50:55 -07:00
..
building-symbolizer-opacity.xml	add testcase for building fill-opacity premultiplied alpha bug - refs #2011	2013-09-19 19:15:32 -07:00
charspacing-lines.xml	add harfbuzz branch testcases	2013-10-23 23:59:14 -07:00
charspacing.xml	add harfbuzz branch testcases	2013-10-23 23:59:14 -07:00
collision.xml	Accept a few changes to visual test xml via harfbuzz branch - refs #1950	2013-07-12 20:30:56 -04:00
colorize-alpha1.xml	move colorize-alpha to visual test suite - refs #1371	2013-09-27 14:49:24 -07:00
colorize-alpha2.xml	move colorize-alpha to visual test suite - refs #1371	2013-09-27 14:49:24 -07:00
colorize-alpha3.xml	protect against invalid memory access if agg gradient lookup fails to build	2013-09-27 15:24:33 -07:00
colorize-alpha4.xml	allow single color colorize-alpha	2013-09-27 16:11:23 -07:00
dst-over-compositing.xml	reduced testcase for #1995 - refs #1452 and #1369	2013-09-20 13:31:11 -07:00
expressionformat.xml	Start moving visual test usage from osm to csv plugin	2013-05-21 08:46:06 -07:00
formatting-1.xml	Start moving visual test usage from osm to csv plugin	2013-05-21 08:46:06 -07:00
formatting-2.xml	Start moving visual test usage from osm to csv plugin	2013-05-21 08:46:06 -07:00
formatting-3.xml	Start moving visual test usage from osm to csv plugin	2013-05-21 08:46:06 -07:00
formatting-4.xml	Start moving visual test usage from osm to csv plugin	2013-05-21 08:46:06 -07:00
formatting.xml	add harfbuzz branch testcases	2013-10-23 23:59:14 -07:00
gdal-filter-factor.xml	regression test for gdal filter-factor	2013-07-19 18:56:50 -04:00
geometry-transform-translate-patterns.xml	add support for geometry-transform in pattern symbolizers - closes #2065	2013-11-05 16:40:09 -08:00
geometry-transform-translate.xml	fix winding order, allowing boost::polygon clipper to return exterior/interior rings correctly	2013-09-24 15:24:18 -07:00
harfbuzz.xml	visual tests: fix rendering of khmer, malayalam, and bengali tests	2013-12-02 22:47:04 -08:00
hb-fontsets.xml	visual tests: re-enable and update malayalam, bengali, and khmer renderings	2013-12-02 22:35:11 -08:00
image-filters-galore.xml	Add visual test of multiple chained image filters	2013-10-03 16:32:15 -07:00
image-filters-multi-blur-inflate.xml	make inflated image for blurring opt-in via 'image-filters-inflate' option - refs #2165	2014-02-27 11:17:09 -08:00
image-filters-multi-blur.xml	tests: add visual test using multiple blurs	2013-10-03 17:52:52 -07:00
jalign-auto.xml	Start moving visual test usage from osm to csv plugin	2013-05-21 08:46:06 -07:00
khmer.xml	visual tests: fix rendering of khmer, malayalam, and bengali tests	2013-12-02 22:47:04 -08:00
line-offset.xml	Accept a few changes to visual test xml via harfbuzz branch - refs #1950	2013-07-12 20:30:56 -04:00
line-opacity-multi-render.xml	add more test files - amends 9886d84 - refs #2052	2013-10-30 12:00:57 -07:00
line-pattern-symbolizer-opacity.xml	consistent use of agg::rgba8_pre to construct premultiplied colors - refs #2011	2013-09-19 19:41:46 -07:00
line-pattern-symbolizer.xml	LinePatternSymbolizer visual test	2013-08-22 12:55:56 +02:00
line-smooth-and-offset.xml	add testcase for #2202	2014-04-03 16:57:11 -07:00
line_break.xml	add harfbuzz branch testcases	2013-10-23 23:59:14 -07:00
lines-1.xml	further convert visual tests to use csv plugin over osm	2013-05-21 08:46:06 -07:00
lines-2.xml	further convert visual tests to use csv plugin over osm	2013-05-21 08:46:06 -07:00
lines-3.xml	further convert visual tests to use csv plugin over osm	2013-05-21 08:46:06 -07:00
lines-4.xml	tests: smaller font sizes and ensure labels are on top	2013-11-08 18:41:00 -08:00
lines-5.xml	tests: smaller font sizes and ensure labels are on top	2013-11-08 18:41:00 -08:00
lines-6.xml	visual tests: re-enable and update malayalam, bengali, and khmer renderings	2013-12-02 22:35:11 -08:00
lines-shield.xml	further convert visual tests to use csv plugin over osm	2013-05-21 08:46:06 -07:00
list.xml	remove tabs	2013-09-30 13:30:16 -07:00
map-background-image-compositing.xml	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
marker-multi-policy.xml	Fix marker-multi-policy test. Closes #1612	2012-11-29 15:00:26 +01:00
marker-on-hex-grid.xml	visual tests - stop testing agg v cairo and rather cairo v cairo - add test for #1600	2013-03-06 11:32:27 -08:00
marker-on-line-and-line-placement.xml	add expected (currently failing) test for #1931	2013-06-28 15:03:55 -04:00
marker-on-line-spacing-eq-width-overlap.xml	tests: make consistent the proj4 string for epsg:4326	2013-01-25 00:49:55 -08:00
marker-on-line-spacing-eq-width.xml	tests: make consistent the proj4 string for epsg:4326	2013-01-25 00:49:55 -08:00
marker-on-line.xml	add a visual test for marker middle point placement on lines - refs #1604	2012-12-10 15:55:13 -08:00
marker-path-expression.xml	add regression test for #1952	2013-07-23 20:00:42 -04:00
marker-svg-empty-g-element.xml	add testcase for #1944	2013-07-10 17:23:17 -04:00
marker-svg-opacity.xml	visual testcase for #1744	2013-03-11 15:09:04 -07:00
marker-svg-opacity2.xml	fix handling of opacity when rendering svg with cairo - closes #1943	2013-07-10 16:19:28 -04:00
marker-with-background-image-and-hsla-transform.xml	enforce valid hsla values - refs #1954	2013-07-24 14:24:33 -04:00
marker-with-background-image.xml	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
marker_line_placement_on_points.xml	tests: make consistent the proj4 string for epsg:4326	2013-01-25 00:49:55 -08:00
orientation.xml	add harfbuzz branch testcases	2013-10-23 23:59:14 -07:00
raster-color-to-alpha1.xml	add color-to-alpha image-filter - closes #2023	2013-09-26 16:14:40 -07:00
raster-color-to-alpha2.xml	add color-to-alpha image-filter - closes #2023	2013-09-26 16:14:40 -07:00
raster-color-to-alpha3.xml	add color-to-alpha image-filter - closes #2023	2013-09-26 16:14:40 -07:00
raster-color-to-alpha4.xml	add color-to-alpha image-filter - closes #2023	2013-09-26 16:14:40 -07:00
raster-color-to-alpha5.xml	add color-to-alpha image-filter - closes #2023	2013-09-26 16:14:40 -07:00
raster_colorizer.xml	move colorizer tests to visual suite	2013-09-25 14:08:47 -07:00
raster_symbolizer.xml	move colorizer tests to visual suite	2013-09-25 14:08:47 -07:00
road-casings-grouped-rendering.xml	add visual tests for group-by feature - refs #916	2013-07-18 18:35:14 -04:00
road-casings-non-grouped-rendering.xml	add visual tests for group-by feature - refs #916	2013-07-18 18:35:14 -04:00
rtl-point.xml	Start moving visual test usage from osm to csv plugin	2013-05-21 08:46:06 -07:00
shield-on-line-spacing-eq-width.xml	tests for 1849	2013-05-20 12:50:26 -07:00
shield-on-polygon.xml	tests for 1849	2013-05-20 12:50:26 -07:00
shieldsymbolizer-1.xml	Accept a few changes to visual test xml via harfbuzz branch - refs #1950	2013-07-12 20:30:56 -04:00
shieldsymbolizer-2.xml	add harfbuzz branch testcases	2013-10-23 23:59:14 -07:00
shieldsymbolizer-3.xml	add harfbuzz branch testcases	2013-10-23 23:59:14 -07:00
shieldsymbolizer-4.xml	add harfbuzz branch testcases	2013-10-23 23:59:14 -07:00
simple-E.xml	Start moving visual test usage from osm to csv plugin	2013-05-21 08:46:06 -07:00
simple-N.xml	Start moving visual test usage from osm to csv plugin	2013-05-21 08:46:06 -07:00
simple-NE.xml	Start moving visual test usage from osm to csv plugin	2013-05-21 08:46:06 -07:00
simple-NW.xml	Start moving visual test usage from osm to csv plugin	2013-05-21 08:46:06 -07:00
simple-S.xml	Start moving visual test usage from osm to csv plugin	2013-05-21 08:46:06 -07:00
simple-SE.xml	Start moving visual test usage from osm to csv plugin	2013-05-21 08:46:06 -07:00
simple-shield.xml	Start moving visual test usage from osm to csv plugin	2013-05-21 08:46:06 -07:00
simple-SW.xml	Start moving visual test usage from osm to csv plugin	2013-05-21 08:46:06 -07:00
simple-W.xml	Start moving visual test usage from osm to csv plugin	2013-05-21 08:46:06 -07:00
simple.xml	update expected grid outputs	2013-05-21 08:46:07 -07:00
style-level-compositing-tiled-0,0.xml	make inflated image for blurring opt-in via 'image-filters-inflate' option - refs #2165	2014-02-27 11:17:09 -08:00
style-level-compositing-tiled-0,1.xml	make inflated image for blurring opt-in via 'image-filters-inflate' option - refs #2165	2014-02-27 11:17:09 -08:00
style-level-compositing-tiled-1,0.xml	make inflated image for blurring opt-in via 'image-filters-inflate' option - refs #2165	2014-02-27 11:17:09 -08:00
style-level-compositing-tiled-1,1.xml	make inflated image for blurring opt-in via 'image-filters-inflate' option - refs #2165	2014-02-27 11:17:09 -08:00
text-bengali.xml	visual tests: fix rendering of khmer, malayalam, and bengali tests	2013-12-02 22:47:04 -08:00
text-bug1532.xml	add harfbuzz branch testcases	2013-10-23 23:59:14 -07:00
text-bug1533.xml	add harfbuzz branch testcases	2013-10-23 23:59:14 -07:00
text-bug1820+0.xml	add harfbuzz branch testcases	2013-10-23 23:59:14 -07:00
text-bug1820+1.xml	add harfbuzz branch testcases	2013-10-23 23:59:14 -07:00
text-bug1820-1.xml	add harfbuzz branch testcases	2013-10-23 23:59:14 -07:00
text-bug2037.xml	tests: no need to reference khmer font directory for bug2037	2013-11-04 21:06:32 -08:00
text-expressionformat-color.xml	add harfbuzz branch testcases	2013-10-23 23:59:14 -07:00
text-halign.xml	add harfbuzz branch testcases	2013-10-23 23:59:14 -07:00
text-halo-rasterizer.xml	More tests.	2013-04-03 02:22:07 +02:00
text-malayalam.xml	visual tests: fix rendering of khmer, malayalam, and bengali tests	2013-12-02 22:47:04 -08:00
tiff-alpha-broken-assoc-alpha-gdal.xml	finish #1512 and adjust tests to use new parameter	2012-10-01 17:09:28 -07:00
tiff-alpha-broken-assoc-alpha-raster.xml	finish #1512 and adjust tests to use new parameter	2012-10-01 17:09:28 -07:00
tiff-alpha-gdal.xml	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
tiff-alpha-gradient-gdal.xml	start moving raster visual tests into place (add new,currently failing tests for raster.input)	2012-09-26 12:01:28 -07:00
tiff-alpha-gradient-raster.xml	start moving raster visual tests into place (add new,currently failing tests for raster.input)	2012-09-26 12:01:28 -07:00
tiff-alpha-raster.xml	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
tiff-edge-alignment-gdal1.xml	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
tiff-edge-alignment-gdal2.xml	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
tiff-nodata-edge-gdal.xml	start moving raster visual tests into place (add new,currently failing tests for raster.input)	2012-09-26 12:01:28 -07:00
tiff-nodata-edge-raster.xml	point tests at better source files for #1508	2012-10-01 15:05:07 -07:00
tiff-nodata-edge-rgba.xml	one more test for #2023	2014-01-17 19:55:43 -08:00
tiff-nodata-rgb.xml	tests for #2023	2014-01-17 19:46:47 -08:00
tiff-nodata-rgba.xml	tests for #2023	2014-01-17 19:46:47 -08:00
tiff-nodata-tolerance.xml	tests for #2023	2014-01-17 19:46:47 -08:00
tiff-opaque-edge-gdal.xml	tests: make consistent the proj4 string for epsg:4326	2013-01-25 00:49:55 -08:00
tiff-opaque-edge-gdal2.xml	point tests at better source files for #1508	2012-10-01 15:05:07 -07:00
tiff-opaque-edge-raster.xml	tests: make consistent the proj4 string for epsg:4326	2013-01-25 00:49:55 -08:00
tiff-opaque-edge-raster2.xml	point tests at better source files for #1508	2012-10-01 15:05:07 -07:00
tiff-reprojection-1.xml	add visual test to ensure that #1501 does not regress	2013-06-13 20:09:24 -07:00
tiff-reprojection-2.xml	add currently failing test for #1913	2013-06-13 20:20:03 -07:00
tiff-resampling.xml	add testcase for broken premultiplied alpha in resampling - refs #1489 and mapbox/tilemill#1888	2013-01-31 18:37:01 -05:00
tiff_colortable.xml	move/expand gdal nodata tests to visual suite - refs #2023	2013-09-25 13:13:18 -07:00
tiff_colortable_custom_nodata.xml	move/expand gdal nodata tests to visual suite - refs #2023	2013-09-25 13:13:18 -07:00
vrt_colortable.xml	move over other colortable test to visual tests	2013-09-25 14:02:52 -07:00
whole-centroid.xml	Fix "whole" multi centroid computation	2012-11-29 17:55:13 +01:00