Merge pull request #320 from ericbuehl/master

be more tolerant of tiff tag read failures
This commit is contained in:
wiredfool 2013-08-21 15:01:27 -07:00
commit 2974749f21

View File

@ -47,6 +47,7 @@ from PIL import Image, ImageFile
from PIL import ImagePalette from PIL import ImagePalette
from PIL import _binary from PIL import _binary
import warnings
import array, sys import array, sys
import collections import collections
import itertools import itertools
@ -398,7 +399,8 @@ class ImageFileDirectory(collections.MutableMapping):
data = ifd[8:8+size] data = ifd[8:8+size]
if len(data) != size: if len(data) != size:
raise IOError("not enough data") warnings.warn("Possibly corrupt EXIF data. Expecting to read %d bytes but only got %d. Skipping tag %s" % (size, len(data), tag))
continue
self.tagdata[tag] = typ, data self.tagdata[tag] = typ, data
self.tagtype[tag] = typ self.tagtype[tag] = typ