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

Merge pull request #6481 from radarhere/psd_rgba

Browse Source 
Added support for RGBA PSD images
This commit is contained in:
Hugo van Kemenade 2022-08-07 19:09:26 +03:00 committed by GitHub
commit 38e411de42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Tests/images/rgba.psd Normal file
View File

Binary file not shown.

7
Tests/test_file_psd.py
View File

@ -4,7 +4,7 @@ import pytest
from PIL import Image, PsdImagePlugin from PIL import Image, PsdImagePlugin
from .helper import assert_image_similar, hopper, is_pypy from .helper import assert_image_equal_tofile, assert_image_similar, hopper, is_pypy
test_file = "Tests/images/hopper.psd" test_file = "Tests/images/hopper.psd"
@ -107,6 +107,11 @@ def test_open_after_exclusive_load():
im.load() im.load()
def test_rgba():
with Image.open("Tests/images/rgba.psd") as im:
assert_image_equal_tofile(im, "Tests/images/imagedraw_square.png")
def test_icc_profile(): def test_icc_profile():
with Image.open(test_file) as im: with Image.open(test_file) as im:
assert "icc_profile" in im.info assert "icc_profile" in im.info

3
src/PIL/PsdImagePlugin.py
View File

@ -75,6 +75,9 @@ class PsdImageFile(ImageFile.ImageFile):
if channels > psd_channels: if channels > psd_channels:
raise OSError("not enough channels") raise OSError("not enough channels")
if mode == "RGB" and psd_channels == 4:
mode = "RGBA"
channels = 4
self.mode = mode self.mode = mode
self._size = i32(s, 18), i32(s, 14) self._size = i32(s, 18), i32(s, 14)