mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-07-16 11:12:29 +03:00
Apply suggestions from code review
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
This commit is contained in:
parent
b9701b0d52
commit
f22b0c66e8
|
@ -26,7 +26,6 @@ from ._util import is_path
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
import PyQt6
|
import PyQt6
|
||||||
import PyQt5
|
|
||||||
import PySide6
|
import PySide6
|
||||||
|
|
||||||
from . import ImageFile
|
from . import ImageFile
|
||||||
|
@ -40,7 +39,6 @@ if TYPE_CHECKING:
|
||||||
qt_version: str | None
|
qt_version: str | None
|
||||||
qt_versions = [
|
qt_versions = [
|
||||||
["6", "PyQt6"],
|
["6", "PyQt6"],
|
||||||
["5", "PyQt5"],
|
|
||||||
["side6", "PySide6"],
|
["side6", "PySide6"],
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -52,9 +50,6 @@ for version, qt_module in qt_versions:
|
||||||
if qt_module == "PyQt6":
|
if qt_module == "PyQt6":
|
||||||
from PyQt6.QtCore import QBuffer, QIODevice
|
from PyQt6.QtCore import QBuffer, QIODevice
|
||||||
from PyQt6.QtGui import QImage, QPixmap, qRgba
|
from PyQt6.QtGui import QImage, QPixmap, qRgba
|
||||||
elif qt_module == "PyQt5":
|
|
||||||
from PyQt5.QtCore import QBuffer, QIODevice
|
|
||||||
from PyQt5.QtGui import QImage, QPixmap, qRgba
|
|
||||||
elif qt_module == "PySide6":
|
elif qt_module == "PySide6":
|
||||||
from PySide6.QtCore import QBuffer, QIODevice
|
from PySide6.QtCore import QBuffer, QIODevice
|
||||||
from PySide6.QtGui import QImage, QPixmap, qRgba
|
from PySide6.QtGui import QImage, QPixmap, qRgba
|
||||||
|
@ -160,11 +155,11 @@ def _toqclass_helper(im: Image.Image | str | QByteArray) -> dict[str, Any]:
|
||||||
assert palette is not None
|
assert palette is not None
|
||||||
colortable = [rgb(*palette[i : i + 3]) for i in range(0, len(palette), 3)]
|
colortable = [rgb(*palette[i : i + 3]) for i in range(0, len(palette), 3)]
|
||||||
elif im.mode == "RGB":
|
elif im.mode == "RGB":
|
||||||
# Populate the 4th channel with 255 #!
|
# Populate the 4th channel with 255
|
||||||
im = im.convert("RGBA")
|
im = im.convert("RGBA")
|
||||||
|
|
||||||
data = im.tobytes("raw", "BGRA")
|
data = im.tobytes("raw", "BGRA")
|
||||||
format = getattr(qt_format, "Format_ARGB32") # 4th channel was populated in line 164
|
format = getattr(qt_format, "Format_ARGB32")
|
||||||
elif im.mode == "RGBA":
|
elif im.mode == "RGBA":
|
||||||
data = im.tobytes("raw", "BGRA")
|
data = im.tobytes("raw", "BGRA")
|
||||||
format = getattr(qt_format, "Format_ARGB32")
|
format = getattr(qt_format, "Format_ARGB32")
|
||||||
|
|
Loading…
Reference in New Issue
Block a user