python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-26 09:56:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wiredfool 2014-01-20 10:46:33 -08:00
commit c8895fa7a4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PIL/WebPImagePlugin.py
View File

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