From 6722ea0394a5f678865e59bfcff7f72263a39391 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Mon, 27 Jan 2014 14:24:22 -0800 Subject: [PATCH] fixup more image comparison tests and expected results --- .../support/mapnik-marker-ellipse-render1.png | Bin 6973 -> 16160 bytes .../support/mapnik-marker-ellipse-render2.png | Bin 6339 -> 14269 bytes .../markers_complex_rendering_test.py | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/python_tests/images/support/mapnik-marker-ellipse-render1.png b/tests/python_tests/images/support/mapnik-marker-ellipse-render1.png index 4ef3f550c2e1ad65e1a92c5ad39fb9566ef563a8..b6563ebd11ceadf2f959042618f8bc73b4e1e6e8 100644 GIT binary patch literal 16160 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 Iqv9CzKNp71ivR!s diff --git a/tests/python_tests/images/support/mapnik-marker-ellipse-render2.png b/tests/python_tests/images/support/mapnik-marker-ellipse-render2.png index 8201f95b8331809e77d21c6085b13b5b074356eb..4479d5c0dd39da0b118f8588607dfd5294ff4d7e 100644 GIT binary patch literal 14269 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 Dl(rZK literal 6339 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 R27AI5SeRHFR~iy2{|8{5b@2cI diff --git a/tests/python_tests/markers_complex_rendering_test.py b/tests/python_tests/markers_complex_rendering_test.py index 756b65073..09c5baf85 100644 --- a/tests/python_tests/markers_complex_rendering_test.py +++ b/tests/python_tests/markers_complex_rendering_test.py @@ -18,7 +18,7 @@ if 'csv' in mapnik.DatasourceCache.plugin_names(): mapnik.render(m,im) actual = '/tmp/mapnik-marker-ellipse-render1.png' expected = 'images/support/mapnik-marker-ellipse-render1.png' - im.save(actual) + im.save(actual,'png32') expected_im = mapnik.Image.open(expected) eq_(im.tostring('png32'),expected_im.tostring('png32'), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) @@ -31,7 +31,7 @@ if 'csv' in mapnik.DatasourceCache.plugin_names(): mapnik.render(m,im) actual = '/tmp/mapnik-marker-ellipse-render2.png' expected = 'images/support/mapnik-marker-ellipse-render2.png' - im.save(actual) + im.save(actual,'png32') expected_im = mapnik.Image.open(expected) eq_(im.tostring('png32'),expected_im.tostring('png32'), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected))