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

Merge pull request #2767 from wiredfool/pr_1891

Browse Source 
Pr 1891
This commit is contained in:
wiredfool 2017-09-29 10:17:57 +01:00 committed by GitHub
commit d727fdabe2
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
PIL/Image.py
View File

@ -592,6 +592,12 @@ class Image(object):
self.pyaccess = None self.pyaccess = None
self.readonly = 0 self.readonly = 0
def _ensure_mutable(self):
if self.readonly:
self._copy()
else:
self.load()
def _dump(self, file=None, format=None, **options): def _dump(self, file=None, format=None, **options):
import tempfile import tempfile
@ -865,19 +871,17 @@ class Image(object):
:returns: An :py:class:`~PIL.Image.Image` object. :returns: An :py:class:`~PIL.Image.Image` object.
""" """
if not mode:
# determine default mode
if self.mode == "P":
self.load()
if self.palette:
mode = self.palette.mode
else:
mode = "RGB"
else:
return self.copy()
self.load() self.load()
if not mode and self.mode == "P":
# determine default mode
if self.palette:
mode = self.palette.mode
else:
mode = "RGB"
if not mode or (mode == self.mode and not matrix):
return self.copy()
if matrix: if matrix:
# matrix conversion # matrix conversion
if mode not in ("L", "RGB"): if mode not in ("L", "RGB"):
@ -1062,10 +1066,10 @@ class Image(object):
:returns: An :py:class:`~PIL.Image.Image` object. :returns: An :py:class:`~PIL.Image.Image` object.
""" """
self.load()
if box is None: if box is None:
return self.copy() return self.copy()
self.load()
return self._new(self._crop(self.im, box)) return self._new(self._crop(self.im, box))
def _crop(self, im, box): def _crop(self, im, box):
@ -1390,9 +1394,7 @@ class Image(object):
im = im.convert(self.mode) im = im.convert(self.mode)
im = im.im im = im.im
self.load() self._ensure_mutable()
if self.readonly:
self._copy()
if mask: if mask:
mask.load() mask.load()
@ -1498,9 +1500,7 @@ class Image(object):
other color value. other color value.
""" """
self.load() self._ensure_mutable()
if self.readonly:
self._copy()
if self.mode not in ("LA", "RGBA"): if self.mode not in ("LA", "RGBA"):
# attempt to promote self to a matching alpha mode # attempt to promote self to a matching alpha mode
@ -1556,9 +1556,7 @@ class Image(object):
:param offset: An optional offset value. The default is 0.0. :param offset: An optional offset value. The default is 0.0.
""" """
self.load() self._ensure_mutable()
if self.readonly:
self._copy()
self.im.putdata(data, scale, offset) self.im.putdata(data, scale, offset)
@ -1612,10 +1610,9 @@ class Image(object):
:param value: The pixel value. :param value: The pixel value.
""" """
self.load()
if self.readonly: if self.readonly:
self._copy() self._copy()
self.load() self.load()
if self.pyaccess: if self.pyaccess:
return self.pyaccess.putpixel(xy, value) return self.pyaccess.putpixel(xy, value)