Merge pull request #680 from hugovk/spider

Add tests for SPIDER image files

PIL/SpiderImagePlugin.py

@@ -36,18 +36,24 @@
 from __future__ import print_function
 
 from PIL import Image, ImageFile
-import os, struct, sys
+import os
+import struct
+import sys
+
 
 def isInt(f):
     try:
         i = int(f)
-        if f-i == 0: return 1
-        else:        return 0
+        if f-i == 0:
+            return 1
+        else:
+            return 0
     except:
         return 0
 
 iforms = [1, 3, -11, -12, -21, -22]
 
+
 # There is no magic number to identify Spider files, so just check a
 # series of header locations to see if they have reasonable values.
 # Returns no.of bytes in the header, if it is a valid Spider header,
@@ -57,28 +63,30 @@ def isSpiderHeader(t):
     h = (99,) + t   # add 1 value so can use spider header index start=1
     # header values 1,2,5,12,13,22,23 should be integers
     for i in [1, 2, 5, 12, 13, 22, 23]:
-        if not isInt(h[i]): return 0
+        if not isInt(h[i]):
+            return 0
     # check iform
     iform = int(h[5])
-    if not iform in iforms: return 0
+    if iform not in iforms:
+        return 0
     # check other header values
     labrec = int(h[13])   # no. records in file header
     labbyt = int(h[22])   # total no. of bytes in header
     lenbyt = int(h[23])   # record length in bytes
     # print "labrec = %d, labbyt = %d, lenbyt = %d" % (labrec,labbyt,lenbyt)
-    if labbyt != (labrec * lenbyt): return 0
+    if labbyt != (labrec * lenbyt):
+        return 0
     # looks like a valid header
     return labbyt
 
+
 def isSpiderImage(filename):
     fp = open(filename, 'rb')
     f = fp.read(92)   # read 23 * 4 bytes
     fp.close()
-    bigendian = 1
     t = struct.unpack('>23f', f)  # try big-endian first
     hdrlen = isSpiderHeader(t)
     if hdrlen == 0:
-        bigendian = 0
         t = struct.unpack('<23f', f)  # little-endian
         hdrlen = isSpiderHeader(t)
     return hdrlen
@@ -141,7 +149,8 @@ class SpiderImageFile(ImageFile.ImageFile):
             self.rawmode = "F;32F"
         self.mode = "F"
 
-        self.tile = [("raw", (0, 0) + self.size, offset,
+        self.tile = [
+            ("raw", (0, 0) + self.size, offset,
                 (self.rawmode, 0, 1))]
         self.__fp = self.fp  # FIXME: hack
 
@@ -176,6 +185,7 @@ class SpiderImageFile(ImageFile.ImageFile):
         from PIL import ImageTk
         return ImageTk.PhotoImage(self.convert2byte(), palette=256)
 
+
 # --------------------------------------------------------------------
 # Image series
 
@@ -200,6 +210,7 @@ def loadImageSeries(filelist=None):
         imglist.append(im)
     return imglist
 
+
 # --------------------------------------------------------------------
 # For saving images in Spider format
 
@@ -207,10 +218,11 @@ def makeSpiderHeader(im):
     nsam, nrow = im.size
     lenbyt = nsam * 4  # There are labrec records in the header
     labrec = 1024 / lenbyt
-    if 1024%lenbyt != 0: labrec += 1
+    if 1024 % lenbyt != 0:
+        labrec += 1
     labbyt = labrec * lenbyt
     hdr = []
-    nvalues = labbyt / 4
+    nvalues = int(labbyt / 4)
     for i in range(nvalues):
         hdr.append(0.0)
 
@@ -235,6 +247,7 @@ def makeSpiderHeader(im):
         hdrstr.append(struct.pack('f', v))
     return hdrstr
 
+
 def _save(im, fp, filename):
     if im.mode[0] != "F":
         im = im.convert('F')
@@ -255,6 +268,7 @@ def _save(im, fp, filename):
 
     fp.close()
 
+
 def _save_spider(im, fp, filename):
     # get the filename extension and register it with Image
     fn, ext = os.path.splitext(filename)
@@ -292,5 +306,7 @@ if __name__ == "__main__":
     if outfile != "":
         # perform some image operation
         im = im.transpose(Image.FLIP_LEFT_RIGHT)
-        print("saving a flipped version of %s as %s " % (os.path.basename(filename), outfile))
+        print(
+            "saving a flipped version of %s as %s " %
+            (os.path.basename(filename), outfile))
         im.save(outfile, "SPIDER")

Tests/test_file_spider.py

@@ -0,0 +1,36 @@
+from tester import *
+
+from PIL import Image
+from PIL import SpiderImagePlugin
+
+test_file = "Tests/images/lena.spider"
+
+
+def test_sanity():
+    im = Image.open(test_file)
+    im.load()
+    assert_equal(im.mode, "F")
+    assert_equal(im.size, (128, 128))
+    assert_equal(im.format, "SPIDER")
+
+
+def test_save():
+    # Arrange
+    temp = tempfile('temp.spider')
+    im = lena()
+
+    # Act
+    im.save(temp, "SPIDER")
+
+    # Assert
+    im2 = Image.open(temp)
+    assert_equal(im2.mode, "F")
+    assert_equal(im2.size, (128, 128))
+    assert_equal(im2.format, "SPIDER")
+
+
+def test_isSpiderImage():
+    assert_true(SpiderImagePlugin.isSpiderImage(test_file))
+
+
+# End of file