From: Patrick McCarty <address@hidden> Date: Wed, 25 Nov 2009 05:27:34 +0000 (-0800) Subject: output-distance: Add new flag for `compare'. X-Git-Tag: release/2.13.45-1~16^2~6 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=49dc60e9593bb088f436be8b49e2417aba6c123c;p=lilypond.git output-distance: Add new flag for `compare'. Newer versions of ImageMagick seem to be more picky about comparing images that are not very similar. I don't know any further details, but this patch fixes `make check' for me when comparing release/2.13.7-1 with release/2.13.8-1. I am running ImageMagick 6.5.7-10. Graham adds: I bumped imagemagick in GUB, and this is required to do 'make check' in ubuntu lilydev remix, so I'm adding this now. --- diff --git a/scripts/build/output-distance.py b/scripts/build/output-distance.py index 6b63e79f90..19b14435f6 100644 --- a/scripts/build/output-distance.py +++ b/scripts/build/output-distance.py @@ -87,7 +87,7 @@ def compare_png_images (old, new, dest_dir): system ('convert -depth 8 -crop %dx%d+0+0 %s %s/crop1.png' % (dims + (old, dir))) system ('convert -depth 8 -crop %dx%d+0+0 %s %s/crop2.png' % (dims + (new, dir))) - system ('compare -depth 8 %(dir)s/crop1.png %(dir)s/crop2.png %(dir)s/diff.png' % locals ()) + system ('compare -depth 8 -dissimilarity-threshold 1 %(dir)s/crop1.png %(dir)s/crop2.png %(dir)s/diff.png' % locals ()) system ("convert -depth 8 %(dir)s/diff.png -blur 0x3 -negate -channel alpha,blue -type TrueColorMatte -fx 'intensity' %(dir)s/matte.png" % locals ())