Merge branch 'fix-typeerror' of https://github.com/homm/Pillow into webp_exif

This commit is contained in:
wiredfool 2014-01-20 10:46:33 -08:00
commit c8895fa7a4

View File

@ -32,7 +32,9 @@ class WebPImageFile(ImageFile.ImageFile):
def _open(self):
data, width, height, self.mode, icc_profile, exif = _webp.WebPDecode(self.fp.read())
if icc_profile:
self.info["icc_profile"] = icc_profile
if exif:
self.info["exif"] = exif
self.size = width, height