Dane Springmeyer 71e7faed0d Merge branch 'master' of github.com:mapnik/mapnik into release/image_data_any ...

Conflicts:
	tests/python_tests/image_test.py
	tests/python_tests/image_tiff_test.py
	tests/visual_tests/images/tiff-opaque-edge-raster2-600-400-1.0-agg-reference.png
	tests/visual_tests/images/tiff-opaque-edge-raster2-600-400-2.0-agg-reference.png

2015-02-03 00:05:15 -08:00

..

encoding-opts

update visual test images after #2671

2015-02-02 20:23:45 -08:00

pgraster

get pgraster tests passing again + update expected images - refs #2639

2015-01-26 22:14:38 -08:00

transparency

re-enable webp tests + update expected images after #2662

2015-02-02 10:38:08 -08:00

a.png

fix behavior of compositing via python api now that we have premultiplication issues sorted out in core - refs #1262 and #314 and #1211

2012-06-21 15:44:57 -04:00

b.png

fix behavior of compositing via python api now that we have premultiplication issues sorted out in core - refs #1262 and #314 and #1211

2012-06-21 15:44:57 -04:00

dataraster_coloring.png

convert raster_symbolizer_test to use full image comparisons

2014-12-03 13:53:04 -05:00

mapnik-layer-buffer-size.png

update expected test after 41064ed49d

2014-08-19 08:35:57 -07:00

mapnik-marker-ellipse-render1.png

update a few expected images

2014-12-03 13:41:57 -05:00

mapnik-marker-ellipse-render2.png

update a few expected images

2014-12-03 13:41:57 -05:00

mapnik-merc2merc-reprojection-render1.png

fix expected reprojection output after #1473

2012-09-11 17:04:15 -07:00

mapnik-merc2merc-reprojection-render2.png

update tests images after change made to agg src_over in #1452, refs #1369

2012-08-31 18:16:49 -07:00

mapnik-merc2wgs84-reprojection-render.png

make clipping off by default - closes #2146

2014-07-28 20:31:10 -07:00

mapnik-palette-test.png

update a few expected images

2014-12-03 13:38:55 -05:00

mapnik-python-circle-render1.png

python plugin: remove Shapely dependency from tests

2012-08-18 17:17:14 +01:00

mapnik-python-point-render1.png

python: a new plugin to use arbitrary Python as a data source

2012-07-31 17:05:27 +01:00

mapnik-style-level-opacity.png

update tests images after change made to agg src_over in #1452, refs #1369

2012-08-31 18:16:49 -07:00

mapnik-wgs842merc-reprojection-render.png

make clipping off by default - closes #2146

2014-07-28 20:31:10 -07:00

marker-in-center-not-placed.png

add test for render_with_detector + fix scale rendering tests - refs #2075

2013-11-13 10:45:23 -08:00

marker-in-center.png

add test for render_with_detector + fix scale rendering tests - refs #2075

2013-11-13 10:45:23 -08:00

marker-text-line-scale-factor-0.1.png

update a few expected images

2014-12-03 13:38:55 -05:00

marker-text-line-scale-factor-0.005.png

update a few expected images

2014-12-03 13:38:55 -05:00

marker-text-line-scale-factor-0.899.png

update a few expected images

2014-12-03 13:38:55 -05:00

marker-text-line-scale-factor-1.5.png

update expected visual images against freetype 2.5.4

2014-12-22 13:48:40 -08:00

marker-text-line-scale-factor-1.png

update a few expected images

2014-12-03 13:38:55 -05:00

marker-text-line-scale-factor-1e-05.png

update expected text images - refs #2277 #2276

2014-06-20 20:29:01 -07:00

marker-text-line-scale-factor-2.png

update expected visual images against freetype 2.5.4

2014-12-22 13:48:40 -08:00

marker-text-line-scale-factor-5.png

update expected visual images against freetype 2.5.4

2014-12-22 13:48:40 -08:00

marker-text-line-scale-factor-10.png

update a few expected images

2014-12-03 13:38:55 -05:00

marker-text-line-scale-factor-100.png

update a few expected images

2014-12-03 13:38:55 -05:00

raster_warping_does_not_overclip_source.png

convert raster_symbolizer_test to use full image comparisons

2014-12-03 13:53:04 -05:00

raster_warping.png

update warp expected image

2014-12-17 12:06:07 -08:00

raster-alpha.png

fix reference raster images after fixing edge effects as per #1471

2012-09-14 17:02:53 -07:00

spacing.png

convert old tests into proper python tests - closes #1460

2013-05-16 12:23:19 -07:00