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

Merge pull request #4076 from radarhere/loading

Browse Source 
Do not seek if the file pointer is about to be closed
This commit is contained in:
Hugo van Kemenade 2019-09-21 17:01:23 +03:00 committed by GitHub
commit 89c901a93f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/PIL/TiffImagePlugin.py
View File

@ -1165,6 +1165,7 @@ class TiffImageFile(ImageFile.ImageFile):
except ValueError:
raise IOError("Couldn't set the image")
close_self_fp = self._exclusive_fp and not self._is_animated
if hasattr(self.fp, "getvalue"):
# We've got a stringio like thing passed in. Yay for all in memory.
# The decoder needs the entire file in one shot, so there's not
@ -1182,7 +1183,8 @@ class TiffImageFile(ImageFile.ImageFile):
# we've got a actual file on disk, pass in the fp.
if DEBUG:
print("have fileno, calling fileno version of the decoder.")
self.fp.seek(0)
if not close_self_fp:
self.fp.seek(0)
# 4 bytes, otherwise the trace might error out
n, err = decoder.decode(b"fpfp")
else:
@ -1199,7 +1201,7 @@ class TiffImageFile(ImageFile.ImageFile):
self.load_end()
# libtiff closed the fp in a, we need to close self.fp, if possible
if self._exclusive_fp and not self._is_animated:
if close_self_fp:
self.fp.close()
self.fp = None # might be shared