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

Merge pull request #5775 from hugovk/mingw-qt6

Browse Source
This commit is contained in:
Hugo van Kemenade 2021-10-18 12:38:14 +03:00 committed by GitHub
commit b4bd8943fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test-mingw.yml vendored
View File

@ -42,7 +42,7 @@ jobs:
${{ matrix.package }}-python3-numpy \ ${{ matrix.package }}-python3-numpy \
${{ matrix.package }}-python3-olefile \ ${{ matrix.package }}-python3-olefile \
${{ matrix.package }}-python3-pip \ ${{ matrix.package }}-python3-pip \
${{ matrix.package }}-python3-pyqt5 \ ${{ matrix.package }}-python-pyqt6 \
${{ matrix.package }}-python3-setuptools \ ${{ matrix.package }}-python3-setuptools \
${{ matrix.package }}-freetype \ ${{ matrix.package }}-freetype \
${{ matrix.package }}-ghostscript \ ${{ matrix.package }}-ghostscript \

8
src/PIL/ImageQt.py
View File

@ -66,7 +66,13 @@ def fromqimage(im):
:param im: QImage or PIL ImageQt object :param im: QImage or PIL ImageQt object
""" """
buffer = QBuffer() buffer = QBuffer()
qt_openmode = QIODevice.OpenMode if qt_version == "6" else QIODevice if qt_version == "6":
try:
qt_openmode = QIODevice.OpenModeFlag
except AttributeError:
qt_openmode = QIODevice.OpenMode
else:
qt_openmode = QIODevice
buffer.open(qt_openmode.ReadWrite) buffer.open(qt_openmode.ReadWrite)
# preserve alpha channel with png # preserve alpha channel with png
# otherwise ppm is more friendly with Image.open # otherwise ppm is more friendly with Image.open