python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-15 10:42:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Combined duplicate lines

Browse Source
This commit is contained in:
Andrew Murray 2017-09-06 11:21:50 +10:00
parent e0eb92ac0e
commit e02f828358
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PIL/Image.py
View File

@ -1494,14 +1494,13 @@ class Image(object):
mode = getmodebase(self.mode) + "A" mode = getmodebase(self.mode) + "A"
try: try:
self.im.setmode(mode) self.im.setmode(mode)
self.pyaccess = None
except (AttributeError, ValueError): except (AttributeError, ValueError):
# do things the hard way # do things the hard way
im = self.im.convert(mode) im = self.im.convert(mode)
if im.mode not in ("LA", "RGBA"): if im.mode not in ("LA", "RGBA"):
raise ValueError # sanity check raise ValueError # sanity check
self.im = im self.im = im
self.pyaccess = None self.pyaccess = None
self.mode = self.im.mode self.mode = self.im.mode
except (KeyError, ValueError): except (KeyError, ValueError):
raise ValueError("illegal image mode") raise ValueError("illegal image mode")
@ -2448,7 +2447,7 @@ def fromqpixmap(im):
_fromarray_typemap = { _fromarray_typemap = {
# (shape, typestr) => mode, rawmode # (shape, typestr) => mode, rawmode
# first two members of shape are set to one # first two members of shape are set to one
((1, 1), "|b1"): ("1", "1;8"), ((1, 1), "|b1"): ("1", "1;8"),
((1, 1), "|u1"): ("L", "L"), ((1, 1), "|u1"): ("L", "L"),
((1, 1), "|i1"): ("I", "I;8"), ((1, 1), "|i1"): ("I", "I;8"),
((1, 1), "<u2"): ("I", "I;16"), ((1, 1), "<u2"): ("I", "I;16"),