diff --git a/tests/python_tests/compositing_test.py b/tests/python_tests/compositing_test.py index c52e78671..5934d79eb 100644 --- a/tests/python_tests/compositing_test.py +++ b/tests/python_tests/compositing_test.py @@ -92,10 +92,10 @@ def test_compare_images(): a.demultiply() if not validate_pixels_are_not_premultiplied(a): fails.append('%s not validly demultiplied' % (name)) - a.save(actual) + a.save(actual,'png32') if not os.path.exists(expected): print 'generating expected test image: %s' % expected - a.save(expected) + a.save(expected,'png32') expected_im = mapnik.Image.open(expected) # compare them if a.tostring('png32') == expected_im.tostring('png32'): @@ -103,7 +103,7 @@ def test_compare_images(): else: fails.append('failed comparing actual (%s) and expected(%s)' % (actual,'tests/python_tests/'+ expected)) fail_im = side_by_side_image(expected_im, a) - fail_im.save('/tmp/mapnik-comp-op-test-' + name + '.fail.png') + fail_im.save('/tmp/mapnik-comp-op-test-' + name + '.fail.png','png32') eq_(len(successes),num_ops,'\n'+'\n'.join(fails)) b.demultiply() # b will be slightly modified by pre and then de multiplication rounding errors @@ -166,10 +166,10 @@ if 'shape' in mapnik.DatasourceCache.plugin_names(): mapnik.render(m, im) actual = '/tmp/mapnik-style-comp-op-' + name + '.png' expected = 'images/style-comp-op/' + name + '.png' - im.save(actual) + im.save(actual,'png32') if not os.path.exists(expected): print 'generating expected test image: %s' % expected - im.save(expected) + im.save(expected,'png32') expected_im = mapnik.Image.open(expected) # compare them if im.tostring('png32') == expected_im.tostring('png32'): @@ -177,7 +177,7 @@ if 'shape' in mapnik.DatasourceCache.plugin_names(): else: fails.append('failed comparing actual (%s) and expected(%s)' % (actual,'tests/python_tests/'+ expected)) fail_im = side_by_side_image(expected_im, im) - fail_im.save('/tmp/mapnik-style-comp-op-' + name + '.fail.png') + fail_im.save('/tmp/mapnik-style-comp-op-' + name + '.fail.png','png32') eq_(len(fails), 0, '\n'+'\n'.join(fails)) def test_style_level_opacity(): @@ -188,7 +188,7 @@ if 'shape' in mapnik.DatasourceCache.plugin_names(): mapnik.render(m,im) actual = '/tmp/mapnik-style-level-opacity.png' expected = 'images/support/mapnik-style-level-opacity.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)) diff --git a/tests/python_tests/image_filters_test.py b/tests/python_tests/image_filters_test.py index b8950f706..9255b0b01 100644 --- a/tests/python_tests/image_filters_test.py +++ b/tests/python_tests/image_filters_test.py @@ -52,7 +52,7 @@ if 'shape' in mapnik.DatasourceCache.plugin_names(): im.save(actual,"png32") if not os.path.exists(expected): print 'generating expected test image: %s' % expected - im.save(expected) + im.save(expected,'png32') expected_im = mapnik.Image.open(expected) # compare them if im.tostring('png32') == expected_im.tostring('png32'): @@ -60,7 +60,7 @@ if 'shape' in mapnik.DatasourceCache.plugin_names(): else: fails.append('failed comparing actual (%s) and expected(%s)' % (actual,'tests/python_tests/'+ expected)) fail_im = side_by_side_image(expected_im, im) - fail_im.save('/tmp/mapnik-style-image-filter-' + filename + '.fail.png') + fail_im.save('/tmp/mapnik-style-image-filter-' + filename + '.fail.png','png32') eq_(len(fails), 0, '\n'+'\n'.join(fails)) if __name__ == "__main__": diff --git a/tests/python_tests/images/style-comp-op/color.png b/tests/python_tests/images/style-comp-op/color.png index 5aee202f4..f32d94c37 100644 Binary files a/tests/python_tests/images/style-comp-op/color.png and b/tests/python_tests/images/style-comp-op/color.png differ diff --git a/tests/python_tests/images/style-comp-op/color_burn.png b/tests/python_tests/images/style-comp-op/color_burn.png index 0836acf17..cf1f72306 100644 Binary files a/tests/python_tests/images/style-comp-op/color_burn.png and b/tests/python_tests/images/style-comp-op/color_burn.png differ diff --git a/tests/python_tests/images/style-comp-op/color_dodge.png b/tests/python_tests/images/style-comp-op/color_dodge.png index 018c2bb17..d4638c249 100644 Binary files a/tests/python_tests/images/style-comp-op/color_dodge.png and b/tests/python_tests/images/style-comp-op/color_dodge.png differ diff --git a/tests/python_tests/images/style-comp-op/contrast.png b/tests/python_tests/images/style-comp-op/contrast.png index 6dbc72a1e..9d3c43095 100644 Binary files a/tests/python_tests/images/style-comp-op/contrast.png and b/tests/python_tests/images/style-comp-op/contrast.png differ diff --git a/tests/python_tests/images/style-comp-op/darken.png b/tests/python_tests/images/style-comp-op/darken.png index 737d078f5..9792549f9 100644 Binary files a/tests/python_tests/images/style-comp-op/darken.png and b/tests/python_tests/images/style-comp-op/darken.png differ diff --git a/tests/python_tests/images/style-comp-op/difference.png b/tests/python_tests/images/style-comp-op/difference.png index e7313a4e2..a33f772e2 100644 Binary files a/tests/python_tests/images/style-comp-op/difference.png and b/tests/python_tests/images/style-comp-op/difference.png differ diff --git a/tests/python_tests/images/style-comp-op/dst_atop.png b/tests/python_tests/images/style-comp-op/dst_atop.png index 2909c4c2b..dbb6b437c 100644 Binary files a/tests/python_tests/images/style-comp-op/dst_atop.png and b/tests/python_tests/images/style-comp-op/dst_atop.png differ diff --git a/tests/python_tests/images/style-comp-op/dst_in.png b/tests/python_tests/images/style-comp-op/dst_in.png index 2909c4c2b..dbb6b437c 100644 Binary files a/tests/python_tests/images/style-comp-op/dst_in.png and b/tests/python_tests/images/style-comp-op/dst_in.png differ diff --git a/tests/python_tests/images/style-comp-op/dst_out.png b/tests/python_tests/images/style-comp-op/dst_out.png index 5c1be3e21..59e0ff057 100644 Binary files a/tests/python_tests/images/style-comp-op/dst_out.png and b/tests/python_tests/images/style-comp-op/dst_out.png differ diff --git a/tests/python_tests/images/style-comp-op/exclusion.png b/tests/python_tests/images/style-comp-op/exclusion.png index e4bd80468..bfef058a3 100644 Binary files a/tests/python_tests/images/style-comp-op/exclusion.png and b/tests/python_tests/images/style-comp-op/exclusion.png differ diff --git a/tests/python_tests/images/style-comp-op/grain_extract.png b/tests/python_tests/images/style-comp-op/grain_extract.png index 7deb5d030..7c7059891 100644 Binary files a/tests/python_tests/images/style-comp-op/grain_extract.png and b/tests/python_tests/images/style-comp-op/grain_extract.png differ diff --git a/tests/python_tests/images/style-comp-op/grain_merge.png b/tests/python_tests/images/style-comp-op/grain_merge.png index be1e81a78..db5159e34 100644 Binary files a/tests/python_tests/images/style-comp-op/grain_merge.png and b/tests/python_tests/images/style-comp-op/grain_merge.png differ diff --git a/tests/python_tests/images/style-comp-op/hard_light.png b/tests/python_tests/images/style-comp-op/hard_light.png index 94c34ad47..01c0c2a6a 100644 Binary files a/tests/python_tests/images/style-comp-op/hard_light.png and b/tests/python_tests/images/style-comp-op/hard_light.png differ diff --git a/tests/python_tests/images/style-comp-op/hue.png b/tests/python_tests/images/style-comp-op/hue.png index c974de030..2d2a3c1a2 100644 Binary files a/tests/python_tests/images/style-comp-op/hue.png and b/tests/python_tests/images/style-comp-op/hue.png differ diff --git a/tests/python_tests/images/style-comp-op/invert.png b/tests/python_tests/images/style-comp-op/invert.png index b4289a6fd..a4e5991bc 100644 Binary files a/tests/python_tests/images/style-comp-op/invert.png and b/tests/python_tests/images/style-comp-op/invert.png differ diff --git a/tests/python_tests/images/style-comp-op/lighten.png b/tests/python_tests/images/style-comp-op/lighten.png index 0f7b2ebf7..3132288eb 100644 Binary files a/tests/python_tests/images/style-comp-op/lighten.png and b/tests/python_tests/images/style-comp-op/lighten.png differ diff --git a/tests/python_tests/images/style-comp-op/minus.png b/tests/python_tests/images/style-comp-op/minus.png index b83699d54..30575e239 100644 Binary files a/tests/python_tests/images/style-comp-op/minus.png and b/tests/python_tests/images/style-comp-op/minus.png differ diff --git a/tests/python_tests/images/style-comp-op/multiply.png b/tests/python_tests/images/style-comp-op/multiply.png index 8192fd2f5..28a1f54f2 100644 Binary files a/tests/python_tests/images/style-comp-op/multiply.png and b/tests/python_tests/images/style-comp-op/multiply.png differ diff --git a/tests/python_tests/images/style-comp-op/overlay.png b/tests/python_tests/images/style-comp-op/overlay.png index 1049d5930..f227d1c9c 100644 Binary files a/tests/python_tests/images/style-comp-op/overlay.png and b/tests/python_tests/images/style-comp-op/overlay.png differ diff --git a/tests/python_tests/images/style-comp-op/plus.png b/tests/python_tests/images/style-comp-op/plus.png index c6b976a55..23effa569 100644 Binary files a/tests/python_tests/images/style-comp-op/plus.png and b/tests/python_tests/images/style-comp-op/plus.png differ diff --git a/tests/python_tests/images/style-comp-op/saturation.png b/tests/python_tests/images/style-comp-op/saturation.png index ff8e9e89e..4fa0aec81 100644 Binary files a/tests/python_tests/images/style-comp-op/saturation.png and b/tests/python_tests/images/style-comp-op/saturation.png differ diff --git a/tests/python_tests/images/style-comp-op/screen.png b/tests/python_tests/images/style-comp-op/screen.png index 695237c7c..b58bc8b21 100644 Binary files a/tests/python_tests/images/style-comp-op/screen.png and b/tests/python_tests/images/style-comp-op/screen.png differ diff --git a/tests/python_tests/images/style-comp-op/soft_light.png b/tests/python_tests/images/style-comp-op/soft_light.png index 591d4637f..8eeffe292 100644 Binary files a/tests/python_tests/images/style-comp-op/soft_light.png and b/tests/python_tests/images/style-comp-op/soft_light.png differ diff --git a/tests/python_tests/images/style-comp-op/src.png b/tests/python_tests/images/style-comp-op/src.png index 37099141c..6e22f7366 100644 Binary files a/tests/python_tests/images/style-comp-op/src.png and b/tests/python_tests/images/style-comp-op/src.png differ diff --git a/tests/python_tests/images/style-comp-op/src_atop.png b/tests/python_tests/images/style-comp-op/src_atop.png index b2ec9b27d..7bc1b5b37 100644 Binary files a/tests/python_tests/images/style-comp-op/src_atop.png and b/tests/python_tests/images/style-comp-op/src_atop.png differ diff --git a/tests/python_tests/images/style-comp-op/src_in.png b/tests/python_tests/images/style-comp-op/src_in.png index 37099141c..6e22f7366 100644 Binary files a/tests/python_tests/images/style-comp-op/src_in.png and b/tests/python_tests/images/style-comp-op/src_in.png differ diff --git a/tests/python_tests/images/style-comp-op/src_over.png b/tests/python_tests/images/style-comp-op/src_over.png index 667447efe..81ff2d4fa 100644 Binary files a/tests/python_tests/images/style-comp-op/src_over.png and b/tests/python_tests/images/style-comp-op/src_over.png differ diff --git a/tests/python_tests/images/style-comp-op/value.png b/tests/python_tests/images/style-comp-op/value.png index 447cb9b68..a8ca2404a 100644 Binary files a/tests/python_tests/images/style-comp-op/value.png and b/tests/python_tests/images/style-comp-op/value.png differ diff --git a/tests/python_tests/images/style-comp-op/xor.png b/tests/python_tests/images/style-comp-op/xor.png index d825d0128..8d276f6f3 100644 Binary files a/tests/python_tests/images/style-comp-op/xor.png and b/tests/python_tests/images/style-comp-op/xor.png differ diff --git a/tests/python_tests/images/style-image-filter/agg-stack-blur22.png b/tests/python_tests/images/style-image-filter/agg-stack-blur22.png index 69fd5dd35..c088fa7fd 100644 Binary files a/tests/python_tests/images/style-image-filter/agg-stack-blur22.png and b/tests/python_tests/images/style-image-filter/agg-stack-blur22.png differ diff --git a/tests/python_tests/images/style-image-filter/blur.png b/tests/python_tests/images/style-image-filter/blur.png index ddae26263..2885bb467 100644 Binary files a/tests/python_tests/images/style-image-filter/blur.png and b/tests/python_tests/images/style-image-filter/blur.png differ diff --git a/tests/python_tests/images/style-image-filter/edge-detect.png b/tests/python_tests/images/style-image-filter/edge-detect.png index 6a0b96244..a611f3eda 100644 Binary files a/tests/python_tests/images/style-image-filter/edge-detect.png and b/tests/python_tests/images/style-image-filter/edge-detect.png differ diff --git a/tests/python_tests/images/style-image-filter/emboss.png b/tests/python_tests/images/style-image-filter/emboss.png index 651511f66..9018300ba 100644 Binary files a/tests/python_tests/images/style-image-filter/emboss.png and b/tests/python_tests/images/style-image-filter/emboss.png differ diff --git a/tests/python_tests/images/style-image-filter/gray.png b/tests/python_tests/images/style-image-filter/gray.png index 8328824ad..73c4e4b10 100644 Binary files a/tests/python_tests/images/style-image-filter/gray.png and b/tests/python_tests/images/style-image-filter/gray.png differ diff --git a/tests/python_tests/images/style-image-filter/invert.png b/tests/python_tests/images/style-image-filter/invert.png index c6da22bf3..c317d23fd 100644 Binary files a/tests/python_tests/images/style-image-filter/invert.png and b/tests/python_tests/images/style-image-filter/invert.png differ diff --git a/tests/python_tests/images/style-image-filter/none.png b/tests/python_tests/images/style-image-filter/none.png index b2d37ac66..af571d2e4 100644 Binary files a/tests/python_tests/images/style-image-filter/none.png and b/tests/python_tests/images/style-image-filter/none.png differ diff --git a/tests/python_tests/images/style-image-filter/sharpen.png b/tests/python_tests/images/style-image-filter/sharpen.png index fe04d00e6..034c8c87c 100644 Binary files a/tests/python_tests/images/style-image-filter/sharpen.png and b/tests/python_tests/images/style-image-filter/sharpen.png differ diff --git a/tests/python_tests/images/style-image-filter/sobel.png b/tests/python_tests/images/style-image-filter/sobel.png index 5b0acaab7..c7f16979f 100644 Binary files a/tests/python_tests/images/style-image-filter/sobel.png and b/tests/python_tests/images/style-image-filter/sobel.png differ diff --git a/tests/python_tests/images/style-image-filter/x-gradient.png b/tests/python_tests/images/style-image-filter/x-gradient.png index 4803ce142..76a4879e2 100644 Binary files a/tests/python_tests/images/style-image-filter/x-gradient.png and b/tests/python_tests/images/style-image-filter/x-gradient.png differ diff --git a/tests/python_tests/images/style-image-filter/y-gradient.png b/tests/python_tests/images/style-image-filter/y-gradient.png index f9d31413c..7e9ad706c 100644 Binary files a/tests/python_tests/images/style-image-filter/y-gradient.png and b/tests/python_tests/images/style-image-filter/y-gradient.png differ 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 b6563ebd1..254f81172 100644 Binary files a/tests/python_tests/images/support/mapnik-marker-ellipse-render1.png and b/tests/python_tests/images/support/mapnik-marker-ellipse-render1.png differ 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 4479d5c0d..c2cd87699 100644 Binary files a/tests/python_tests/images/support/mapnik-marker-ellipse-render2.png and b/tests/python_tests/images/support/mapnik-marker-ellipse-render2.png differ diff --git a/tests/python_tests/images/support/marker-text-line-scale-factor-0.005.png b/tests/python_tests/images/support/marker-text-line-scale-factor-0.005.png index bb059f24c..9a61ed4cb 100644 Binary files a/tests/python_tests/images/support/marker-text-line-scale-factor-0.005.png and b/tests/python_tests/images/support/marker-text-line-scale-factor-0.005.png differ diff --git a/tests/python_tests/images/support/marker-text-line-scale-factor-0.1.png b/tests/python_tests/images/support/marker-text-line-scale-factor-0.1.png index fe0337960..5f310641d 100644 Binary files a/tests/python_tests/images/support/marker-text-line-scale-factor-0.1.png and b/tests/python_tests/images/support/marker-text-line-scale-factor-0.1.png differ diff --git a/tests/python_tests/images/support/marker-text-line-scale-factor-0.899.png b/tests/python_tests/images/support/marker-text-line-scale-factor-0.899.png index 0fa12f94b..0c2ee56d0 100644 Binary files a/tests/python_tests/images/support/marker-text-line-scale-factor-0.899.png and b/tests/python_tests/images/support/marker-text-line-scale-factor-0.899.png differ diff --git a/tests/python_tests/images/support/marker-text-line-scale-factor-1.5.png b/tests/python_tests/images/support/marker-text-line-scale-factor-1.5.png index 884c1606b..0299b898e 100644 Binary files a/tests/python_tests/images/support/marker-text-line-scale-factor-1.5.png and b/tests/python_tests/images/support/marker-text-line-scale-factor-1.5.png differ diff --git a/tests/python_tests/images/support/marker-text-line-scale-factor-1.png b/tests/python_tests/images/support/marker-text-line-scale-factor-1.png index 34e40d057..8f42bee35 100644 Binary files a/tests/python_tests/images/support/marker-text-line-scale-factor-1.png and b/tests/python_tests/images/support/marker-text-line-scale-factor-1.png differ diff --git a/tests/python_tests/images/support/marker-text-line-scale-factor-10.png b/tests/python_tests/images/support/marker-text-line-scale-factor-10.png index 456fd0108..1c8795ea9 100644 Binary files a/tests/python_tests/images/support/marker-text-line-scale-factor-10.png and b/tests/python_tests/images/support/marker-text-line-scale-factor-10.png differ diff --git a/tests/python_tests/images/support/marker-text-line-scale-factor-100.png b/tests/python_tests/images/support/marker-text-line-scale-factor-100.png index dbb47cef4..92e864e39 100644 Binary files a/tests/python_tests/images/support/marker-text-line-scale-factor-100.png and b/tests/python_tests/images/support/marker-text-line-scale-factor-100.png differ diff --git a/tests/python_tests/images/support/marker-text-line-scale-factor-2.png b/tests/python_tests/images/support/marker-text-line-scale-factor-2.png index 5fddceceb..61c4e38e6 100644 Binary files a/tests/python_tests/images/support/marker-text-line-scale-factor-2.png and b/tests/python_tests/images/support/marker-text-line-scale-factor-2.png differ diff --git a/tests/python_tests/images/support/marker-text-line-scale-factor-5.png b/tests/python_tests/images/support/marker-text-line-scale-factor-5.png index 1d8af5080..70f0b39c6 100644 Binary files a/tests/python_tests/images/support/marker-text-line-scale-factor-5.png and b/tests/python_tests/images/support/marker-text-line-scale-factor-5.png differ