Merge b634239 into fbb92e9

PIL/GdImageFile.py

@@ -25,16 +25,9 @@
 
 from . import ImageFile, ImagePalette
 from ._binary import i16be as i16
-from ._util import isPath
 
 __version__ = "0.1"
 
-try:
-    import builtins
-except ImportError:
-    import __builtin__
-    builtins = __builtin__
-
 
 ##
 # Image plugin for the GD uncompressed format.  Note that this format
@@ -53,12 +46,12 @@ def _open(self):
         s = self.fp.read(775)
 
         self.mode = "L"  # FIXME: "P"
-        self.size = i16(s[0:2]), i16(s[2:4])
+        self.size = i16(s[2:4]), i16(s[4:6])
 
         # transparency index
         tindex = i16(s[5:7])
         if tindex < 256:
-            self.info["transparent"] = tindex
+            self.info["transparency"] = tindex
 
         self.palette = ImagePalette.raw("RGB", s[7:])
 
@@ -78,13 +71,7 @@ def open(fp, mode="r"):
     if mode != "r":
         raise ValueError("bad mode")
 
-    if isPath(fp):
-        filename = fp
-        fp = builtins.open(fp, "rb")
-    else:
-        filename = ""
-
     try:
-        return GdImageFile(fp, filename)
+        return GdImageFile(fp)
     except SyntaxError:
         raise IOError("cannot identify this image file")

Tests/test_file_gd.py

@@ -0,0 +1,17 @@
+from helper import unittest, PillowTestCase
+
+from PIL import GdImageFile
+
+TEST_GD_FILE = "Tests/images/gd"
+
+
+class TestFileGd(PillowTestCase):
+
+    def test_sanity(self):
+        im = GdImageFile.open(TEST_GD_FILE)
+        self.assertEqual(im.size, (10, 20))
+        self.assertEqual(im.format, "GD")
+
+
+if __name__ == '__main__':
+    unittest.main()