snapdiff: Add filename column to HTML report

[apitrace] / scripts / snapdiff.py
diff --git a/scripts/snapdiff.py b/scripts/snapdiff.py

index 857c0dfbdc00415435f69c3c947a1cec180381ae..291b2da9425d71e4e075bec9d66fb049fd018daa 100755 (executable)
--- a/scripts/snapdiff.py
+++ b/scripts/snapdiff.py
@@ -39,10 +39,12 @@ import operator
  from PIL import Image
  from PIL import ImageChops
  from PIL import ImageEnhance
+from PIL import ImageFilter
  
  
  thumb_size = 320, 320
  
+gaussian_kernel = ImageFilter.Kernel((3, 3), [1, 2, 1, 2, 4, 2, 1, 2, 1], 16)
  
  class Comparer:
      '''Image comparer.'''
@@ -80,12 +82,16 @@ class Comparer:
          diff_im = Image.blend(self.src_im, diff_im, 0xcc/255.0)
          diff_im.save(diff_image)
  
-    def precision(self):
+    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 = self.diff.histogram()
+        h = diff.histogram()
          square_error = 0
          for i in range(1, 256):
              square_error += sum(h[i : 3*256: 256])*i*i
@@ -121,14 +127,13 @@ def surface(html, image):
  
  
  def is_image(path):
-    return \
-        path.endswith('.png') \
-        and not path.endswith('.diff.png') \
-        and not path.endswith('.thumb.png')
+    name = os.path.basename(path)
+    name, ext1 = os.path.splitext(name)
+    name, ext2 = os.path.splitext(name)
+    return ext1 in ('.png', '.bmp') and ext2 not in ('.diff', '.thumb')
  
  
  def find_images(prefix):
-    prefix = os.path.abspath(prefix)
      if os.path.isdir(prefix):
          prefix_dir = prefix
      else:
@@ -157,10 +162,14 @@ def main():
          '-f', '--fuzz',
          type="float", dest="fuzz", default=0.05,
          help="fuzz ratio [default: %default]")
+    optparser.add_option(
+        '-a', '--alpha',
+        action="store_true", dest="alpha", default=False,
+        help="take alpha channel in consideration")
      optparser.add_option(
          '--overwrite',
          action="store_true", dest="overwrite", default=False,
-        help="overwrite")
+        help="overwrite images")
  
      (options, args) = optparser.parse_args(sys.argv[1:])
  
@@ -182,7 +191,7 @@ def main():
      html.write('<html>\n')
      html.write('  <body>\n')
      html.write('    <table border="1">\n')
-    html.write('      <tr><th>%s</th><th>%s</th><th>&Delta;</th></tr>\n' % (ref_prefix, src_prefix))
+    html.write('      <tr><th>File</th><th>%s</th><th>%s</th><th>&Delta;</th></tr>\n' % (ref_prefix, src_prefix))
      for image in images:
          ref_image = ref_prefix + image
          src_image = src_prefix + image
@@ -194,10 +203,11 @@ def main():
                 or (os.path.getmtime(delta_image) < os.path.getmtime(ref_image) \
                     and os.path.getmtime(delta_image) < os.path.getmtime(src_image)):
  
-                comparer = Comparer(ref_image, src_image)
+                comparer = Comparer(ref_image, src_image, options.alpha)
                  comparer.write_diff(delta_image, fuzz=options.fuzz)
  
              html.write('      <tr>\n')
+            html.write('        <td>%s</td>\n' % (image,))
              surface(html, ref_image)
              surface(html, src_image)
              surface(html, delta_image)