X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=scripts%2Fsnapdiff.py;h=59ec870ea06954eee1f5ca69f9297d5c42ee3f2d;hb=6d953b4f49f893cc26cc1aa4e419d1eae7da65bf;hp=6a31650238c20b2aadd5cdea6842c18b6ecf1bc4;hpb=be591dbd382d3e647bf4b858333500cdfda2e7d5;p=apitrace diff --git a/scripts/snapdiff.py b/scripts/snapdiff.py index 6a31650..59ec870 100755 --- a/scripts/snapdiff.py +++ b/scripts/snapdiff.py @@ -36,54 +36,82 @@ import optparse import math import operator -import Image -import ImageChops -import ImageEnhance +from PIL import Image +from PIL import ImageChops +from PIL import ImageEnhance +from PIL import ImageFilter -thumb_size = 320, 320 +thumbSize = 320 +gaussian_kernel = ImageFilter.Kernel((3, 3), [1, 2, 1, 2, 4, 2, 1, 2, 1], 16) -def _compare(ref_image, src_image, delta_image): - import subprocess - p = subprocess.Popen([ - 'compare', - '-metric', 'AE', - '-fuzz', '%u%%' % options.fuzz, - '-dissimilarity-threshold', '1', - ref_image, src_image, delta_image - ], stderr=subprocess.PIPE) - _, stderr = p.communicate() - try: - return int(stderr) - except ValueError: - return 0xffffffff +class Comparer: + '''Image comparer.''' + def __init__(self, ref_image, src_image, alpha = False): + if isinstance(ref_image, basestring): + self.ref_im = Image.open(ref_image) + else: + self.ref_im = ref_image -def compare(ref_image, src_image, delta_image): - ref_im = Image.open(ref_image) - src_im = Image.open(src_image) + if isinstance(src_image, basestring): + self.src_im = Image.open(src_image) + else: + self.src_im = src_image - ref_im = ref_im.convert('RGB') - src_im = src_im.convert('RGB') + # Ignore + if not alpha: + self.ref_im = self.ref_im.convert('RGB') + self.src_im = self.src_im.convert('RGB') - diff = ImageChops.difference(src_im, ref_im) + self.diff = ImageChops.difference(self.src_im, self.ref_im) - mask = ImageEnhance.Brightness(diff).enhance(100.0/options.fuzz) - mask = mask.convert('L') + def size_mismatch(self): + return self.ref_im.size != self.src_im.size - lowlight = Image.new('RGB', src_im.size, (0xff, 0xff, 0xff)) - highlight = Image.new('RGB', src_im.size, (0xf1, 0x00, 0x1e)) - delta_im = Image.composite(highlight, lowlight, mask) + def write_diff(self, diff_image, fuzz = 0.05): + if self.size_mismatch(): + return - delta_im = Image.blend(src_im, delta_im, 0xcc/255.0) - delta_im.save(delta_image) + # make a difference image similar to ImageMagick's compare utility + mask = ImageEnhance.Brightness(self.diff).enhance(1.0/fuzz) + mask = mask.convert('L') - # See also http://effbot.org/zone/pil-comparing-images.htm - # TODO: this is approximate due to the grayscale conversion - h = diff.convert('L').histogram() - ae = sum(h[255 * options.fuzz // 100 + 1 : 256]) - return ae + lowlight = Image.new('RGB', self.src_im.size, (0xff, 0xff, 0xff)) + highlight = Image.new('RGB', self.src_im.size, (0xf1, 0x00, 0x1e)) + diff_im = Image.composite(highlight, lowlight, mask) + + diff_im = Image.blend(self.src_im, diff_im, 0xcc/255.0) + diff_im.save(diff_image) + + def precision(self, filter=False): + if self.size_mismatch(): + return 0.0 + + diff = self.diff + if filter: + diff = diff.filter(gaussian_kernel) + + # See also http://effbot.org/zone/pil-comparing-images.htm + h = diff.histogram() + square_error = 0 + for i in range(1, 256): + square_error += sum(h[i : 3*256: 256])*i*i + rel_error = float(square_error*2 + 1) / float(self.diff.size[0]*self.diff.size[1]*3*255*255*2) + bits = -math.log(rel_error)/math.log(2.0) + return bits + + def ae(self, fuzz = 0.05): + # Compute absolute error + + if self.size_mismatch(): + return sys.maxint + + # TODO: this is approximate due to the grayscale conversion + h = self.diff.convert('L').histogram() + ae = sum(h[int(255 * fuzz) + 1 : 256]) + return ae def surface(html, image): @@ -94,7 +122,18 @@ def surface(html, image): and (not os.path.exists(thumb) \ or os.path.getmtime(thumb) < os.path.getmtime(image)): im = Image.open(image) - im.thumbnail(thumb_size) + imageWidth, imageHeight = im.size + if imageWidth <= thumbSize and imageHeight <= thumbSize: + if imageWidth >= imageHeight: + imageHeight = imageHeight*thumbSize/imageWidth + imageWidth = thumbSize + else: + imageWidth = imageWidth*thumbSize/imageHeight + imageHeight = thumbSize + html.write('
%s | %s | Δ | |
---|---|---|---|
File | %s | %s | Δ |
%s | \n' % (bgcolor, ref_image, image)) + if not match or options.show_all: + if options.overwrite \ + or not os.path.exists(delta_image) \ + or (os.path.getmtime(delta_image) < os.path.getmtime(ref_image) \ + and os.path.getmtime(delta_image) < os.path.getmtime(src_image)): + comparer.write_diff(delta_image, fuzz=options.fuzz) + surface(html, ref_image) + surface(html, src_image) + surface(html, delta_image) html.write('