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

Merge pull request #5260 from radarhere/imageqt_exclusive_fp

Browse Source 
Ensure file is closed if it is opened by ImageQt.ImageQt
This commit is contained in:
Hugo van Kemenade 2021-03-08 14:13:48 +02:00 committed by GitHub
commit d9e4424a7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Tests/test_imageqt.py
View File

@ -4,11 +4,14 @@ from PIL import ImageQt
from .helper import hopper from .helper import hopper
pytestmark = pytest.mark.skipif(
not ImageQt.qt_is_installed, reason="Qt bindings are not installed"
)
if ImageQt.qt_is_installed: if ImageQt.qt_is_installed:
from PIL.ImageQt import qRgba from PIL.ImageQt import qRgba
@pytest.mark.skipif(not ImageQt.qt_is_installed, reason="Qt bindings are not installed")
def test_rgb(): def test_rgb():
# from https://doc.qt.io/archives/qt-4.8/qcolor.html # from https://doc.qt.io/archives/qt-4.8/qcolor.html
# typedef QRgb # typedef QRgb
@ -38,7 +41,13 @@ def test_rgb():
checkrgb(0, 0, 255) checkrgb(0, 0, 255)
@pytest.mark.skipif(not ImageQt.qt_is_installed, reason="Qt bindings are not installed")
def test_image(): def test_image():
for mode in ("1", "RGB", "RGBA", "L", "P"): for mode in ("1", "RGB", "RGBA", "L", "P"):
ImageQt.ImageQt(hopper(mode)) ImageQt.ImageQt(hopper(mode))
def test_closed_file():
with pytest.warns(None) as record:
ImageQt.ImageQt("Tests/images/hopper.gif")
assert not record

19
src/PIL/ImageQt.py
View File

@ -128,6 +128,7 @@ def align8to32(bytes, width, mode):
def _toqclass_helper(im): def _toqclass_helper(im):
data = None data = None
colortable = None colortable = None
exclusive_fp = False
# handle filename, if given instead of image name # handle filename, if given instead of image name
if hasattr(im, "toUtf8"): if hasattr(im, "toUtf8"):
@ -135,6 +136,7 @@ def _toqclass_helper(im):
im = str(im.toUtf8(), "utf-8") im = str(im.toUtf8(), "utf-8")
if isPath(im): if isPath(im):
im = Image.open(im) im = Image.open(im)
exclusive_fp = True
qt_format = QImage.Format if qt_version == "6" else QImage qt_format = QImage.Format if qt_version == "6" else QImage
if im.mode == "1": if im.mode == "1":
@ -157,10 +159,15 @@ def _toqclass_helper(im):
data = im.tobytes("raw", "BGRA") data = im.tobytes("raw", "BGRA")
format = qt_format.Format_ARGB32 format = qt_format.Format_ARGB32
else: else:
if exclusive_fp:
im.close()
raise ValueError(f"unsupported image mode {repr(im.mode)}") raise ValueError(f"unsupported image mode {repr(im.mode)}")
__data = data or align8to32(im.tobytes(), im.size[0], im.mode) size = im.size
return {"data": __data, "im": im, "format": format, "colortable": colortable} __data = data or align8to32(im.tobytes(), size[0], im.mode)
if exclusive_fp:
im.close()
return {"data": __data, "size": size, "format": format, "colortable": colortable}
if qt_is_installed: if qt_is_installed:
@ -182,8 +189,8 @@ if qt_is_installed:
self.__data = im_data["data"] self.__data = im_data["data"]
super().__init__( super().__init__(
self.__data, self.__data,
im_data["im"].size[0], im_data["size"][0],
im_data["im"].size[1], im_data["size"][1],
im_data["format"], im_data["format"],
) )
if im_data["colortable"]: if im_data["colortable"]:
@ -197,8 +204,8 @@ def toqimage(im):
def toqpixmap(im): def toqpixmap(im):
# # This doesn't work. For now using a dumb approach. # # This doesn't work. For now using a dumb approach.
# im_data = _toqclass_helper(im) # im_data = _toqclass_helper(im)
# result = QPixmap(im_data['im'].size[0], im_data['im'].size[1]) # result = QPixmap(im_data["size"][0], im_data["size"][1])
# result.loadFromData(im_data['data']) # result.loadFromData(im_data["data"])
# Fix some strange bug that causes # Fix some strange bug that causes
if im.mode == "RGB": if im.mode == "RGB":
im = im.convert("RGBA") im = im.convert("RGBA")