python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-23 06:29:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Change wrapping to include some context on first line; plus typo fix

Browse Source
This commit is contained in:
hugovk 2014-07-29 23:00:38 +03:00
parent 70528dd539
commit 56404f6888
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
PIL/TiffImagePlugin.py
View File

@ -453,19 +453,17 @@ class ImageFileDirectory(collections.MutableMapping):
data = ifd[8:8+size] data = ifd[8:8+size]
if len(data) != size: if len(data) != size:
warnings.warn( warnings.warn("Possibly corrupt EXIF data. "
"Possibly corrupt EXIF data. " "Expecting to read %d bytes but only got %d. "
"Expecting to read %d bytes but only got %d. " "Skipping tag %s" % (size, len(data), tag))
"Skipping tag %s" % (size, len(data), tag))
continue continue
self.tagdata[tag] = data self.tagdata[tag] = data
self.tagtype[tag] = typ self.tagtype[tag] = typ
if Image.DEBUG: if Image.DEBUG:
if tag in ( if tag in (COLORMAP, IPTC_NAA_CHUNK, PHOTOSHOP_CHUNK,
COLORMAP, IPTC_NAA_CHUNK, ICCPROFILE, XMP):
PHOTOSHOP_CHUNK, ICCPROFILE, XMP):
print("- value: <table: %d bytes>" % size) print("- value: <table: %d bytes>" % size)
else: else:
print("- value:", self[tag]) print("- value:", self[tag])
@ -550,9 +548,8 @@ class ImageFileDirectory(collections.MutableMapping):
typname = TiffTags.TYPES.get(typ, "unknown") typname = TiffTags.TYPES.get(typ, "unknown")
print("save: %s (%d)" % (tagname, tag), end=' ') print("save: %s (%d)" % (tagname, tag), end=' ')
print("- type: %s (%d)" % (typname, typ), end=' ') print("- type: %s (%d)" % (typname, typ), end=' ')
if tag in ( if tag in (COLORMAP, IPTC_NAA_CHUNK, PHOTOSHOP_CHUNK,
COLORMAP, IPTC_NAA_CHUNK, ICCPROFILE, XMP):
PHOTOSHOP_CHUNK, ICCPROFILE, XMP):
size = len(data) size = len(data)
print("- value: <table: %d bytes>" % size) print("- value: <table: %d bytes>" % size)
else: else:
@ -709,8 +706,8 @@ class TiffImageFile(ImageFile.ImageFile):
# (self._compression, (extents tuple), # (self._compression, (extents tuple),
# 0, (rawmode, self._compression, fp)) # 0, (rawmode, self._compression, fp))
ignored, extents, ignored_2, args = self.tile[0] ignored, extents, ignored_2, args = self.tile[0]
decoder = Image._getdecoder( decoder = Image._getdecoder(self.mode, 'libtiff', args,
self.mode, 'libtiff', args, self.decoderconfig) self.decoderconfig)
try: try:
decoder.setimage(self.im, extents) decoder.setimage(self.im, extents)
except ValueError: except ValueError:
@ -839,12 +836,14 @@ class TiffImageFile(ImageFile.ImageFile):
offsets = self.tag[STRIPOFFSETS] offsets = self.tag[STRIPOFFSETS]
h = getscalar(ROWSPERSTRIP, ysize) h = getscalar(ROWSPERSTRIP, ysize)
w = self.size[0] w = self.size[0]
if READ_LIBTIFF or self._compression in [ if READ_LIBTIFF or self._compression in ["tiff_ccitt", "group3",
"tiff_ccitt", "group3", "group4", "group4", "tiff_jpeg",
"tiff_jpeg", "tiff_adobe_deflate", "tiff_adobe_deflate",
"tiff_thunderscan", "tiff_deflate", "tiff_thunderscan",
"tiff_sgilog", "tiff_sgilog24", "tiff_deflate",
"tiff_raw_16"]: "tiff_sgilog",
"tiff_sgilog24",
"tiff_raw_16"]:
# if Image.DEBUG: # if Image.DEBUG:
# print "Activating g4 compression for whole file" # print "Activating g4 compression for whole file"
@ -1002,8 +1001,8 @@ def _save(im, fp, filename):
ifd = ImageFileDirectory(prefix) ifd = ImageFileDirectory(prefix)
compression = im.encoderinfo.get( compression = im.encoderinfo.get('compression', im.info.get('compression',
'compression', im.info.get('compression', 'raw')) 'raw'))
libtiff = WRITE_LIBTIFF or compression != 'raw' libtiff = WRITE_LIBTIFF or compression != 'raw'
@ -1118,8 +1117,8 @@ def _save(im, fp, filename):
# Merge the ones that we have with (optional) more bits from # Merge the ones that we have with (optional) more bits from
# the original file, e.g x,y resolution so that we can # the original file, e.g x,y resolution so that we can
# save(load('')) == original file. # save(load('')) == original file.
for k, v in itertools.chain( for k, v in itertools.chain(ifd.items(),
ifd.items(), getattr(im, 'ifd', {}).items()): getattr(im, 'ifd', {}).items()):
if k not in atts and k not in blocklist: if k not in atts and k not in blocklist:
if type(v[0]) == tuple and len(v) > 1: if type(v[0]) == tuple and len(v) > 1:
# A tuple of more than one rational tuples # A tuple of more than one rational tuples