python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-27 17:54:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into homebrew-isolation

Browse Source
This commit is contained in:
Andrew Murray 2024-10-29 22:38:27 +11:00 committed by GitHub
commit 467f12022e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/test-windows.yml vendored
View File

@ -80,6 +80,12 @@ jobs:
pytest-cov pytest-cov
pytest-timeout pytest-timeout
- name: Install CPython dependencies
if: "!contains(matrix.python-version, 'pypy')"
run: >
python3 -m pip install
PyQt6
- name: Install dependencies - name: Install dependencies
id: install id: install
run: | run: |

3
CHANGES.rst
View File

@ -5,6 +5,9 @@ Changelog (Pillow)
11.1.0 (unreleased) 11.1.0 (unreleased)
------------------- -------------------
- Detach PyQt6 QPixmap instance before returning #8509
[radarhere]
- Corrected EMF DPI #8485 - Corrected EMF DPI #8485
[radarhere] [radarhere]

5
src/PIL/ImageQt.py
View File

@ -213,4 +213,7 @@ def toqimage(im: Image.Image | str | QByteArray) -> ImageQt:
def toqpixmap(im: Image.Image | str | QByteArray) -> QPixmap: def toqpixmap(im: Image.Image | str | QByteArray) -> QPixmap:
qimage = toqimage(im) qimage = toqimage(im)
return getattr(QPixmap, "fromImage")(qimage) pixmap = getattr(QPixmap, "fromImage")(qimage)
if qt_version == "6":
pixmap.detach()
return pixmap