python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-11-11 04:07:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4689 from radarhere/qt

Browse Source 
Removed ImageQt workaround for earlier versions
This commit is contained in:
Hugo van Kemenade 2020-06-13 16:30:04 +03:00 committed by GitHub
commit 41a75210b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/PIL/ImageQt.py
View File

@ -142,12 +142,7 @@ def _toqclass_helper(im):
data = im.tobytes("raw", "BGRX") data = im.tobytes("raw", "BGRX")
format = QImage.Format_RGB32 format = QImage.Format_RGB32
elif im.mode == "RGBA": elif im.mode == "RGBA":
try: data = im.tobytes("raw", "BGRA")
data = im.tobytes("raw", "BGRA")
except SystemError:
# workaround for earlier versions
r, g, b, a = im.split()
im = Image.merge("RGBA", (b, g, r, a))
format = QImage.Format_ARGB32 format = QImage.Format_ARGB32
else: else:
raise ValueError("unsupported image mode %r" % im.mode) raise ValueError("unsupported image mode %r" % im.mode)