X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=scripts%2Fretracediff.py;h=89aac5a526313524e957acb31a0ababe0068bf61;hb=dfd413a5f54bd450850b5e84886949bcdf85b1e7;hp=e59d00a5b65fa74af41d25dcdf4bf0c025e05136;hpb=6f46db0c981e68a3331188314c1bfc2875eb6eee;p=apitrace

diff --git a/scripts/retracediff.py b/scripts/retracediff.py
index e59d00a..89aac5a 100755
--- a/scripts/retracediff.py
+++ b/scripts/retracediff.py
@@ -43,9 +43,9 @@ import jsondiff
 
 # Null file, to use when we're not interested in subprocesses output
 if platform.system() == 'Windows':
-    NULL = open('NUL:', 'wt')
+    NULL = open('NUL:', 'wb')
 else:
-    NULL = open('/dev/null', 'wt')
+    NULL = open('/dev/null', 'wb')
 
 
 class RetraceRun:
@@ -134,9 +134,19 @@ def read_pnm(stream):
     magic = magic.rstrip()
     if magic == 'P5':
         channels = 1
+        bytesPerChannel = 1
         mode = 'L'
     elif magic == 'P6':
         channels = 3
+        bytesPerChannel = 1
+        mode = 'RGB'
+    elif magic == 'Pf':
+        channels = 1
+        bytesPerChannel = 4
+        mode = 'R'
+    elif magic == 'PF':
+        channels = 3
+        bytesPerChannel = 4
         mode = 'RGB'
     else:
         raise Exception('Unsupported magic `%s`' % magic)
@@ -146,9 +156,18 @@ def read_pnm(stream):
         comment += line[1:]
         line = stream.readline()
     width, height = map(int, line.strip().split())
-    maximum = int(stream.readline().strip())
-    assert maximum == 255
-    data = stream.read(height * width * channels)
+    if bytesPerChannel == 1:
+        maximum = int(stream.readline().strip())
+        assert maximum == 255
+    data = stream.read(height * width * channels * bytesPerChannel)
+    if magic == 'PF':
+        # XXX: Image magic only supports single channel floating point images,
+        # so convert to 8bit RGB
+        pixels = array('f', data)
+        pixels *= 255
+        pixels = array('B', pixels)
+        data = pixels.tostring()
+
     image = Image.frombuffer(mode, (width, height), data, 'raw', mode, 0, 1)
     return image, comment
 
@@ -219,6 +238,10 @@ def main():
         '-S', '--snapshot-frequency', metavar='CALLSET',
         type="string", dest="snapshot_frequency", default='draw',
         help="calls to compare [default: %default]")
+    optparser.add_option(
+        '--diff-state',
+        action='store_true', dest='diff_state', default=False,
+        help='diff state between failing calls')
     optparser.add_option(
         '-o', '--output', metavar='FILE',
         type="string", dest="output",
@@ -289,7 +312,7 @@ def main():
                         refImage.save(prefix + '.ref.png')
                         srcImage.save(prefix + '.src.png')
                         comparer.write_diff(prefix + '.diff.png')
-                    if last_bad < last_good:
+                    if last_bad < last_good and options.diff_state:
                         srcRetracer.diff_state(last_good, callNo, output)
                     last_bad = callNo
                 else: