Skip to content

Raise error if image modes do not match ImageCms transform modes #9715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
radarhere wants to merge 3 commits into
base: main
Choose a base branch
from
+13 −7
Open

Raise error if image modes do not match ImageCms transform modes #9715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
066e349
Simplify code by calling apply() from apply_in_place()
radarhere Jun 20, 2026
7f6e9d6
Raise error if output image mode does not match transform output mode
radarhere Jun 20, 2026
642d806
Raise error if input image mode does not match transform input mode
radarhere Jun 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Tests/test_imagecms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,10 @@ def test_exceptions() -> None:
psRGB = ImageCms.createProfile("sRGB")
pLab = ImageCms.createProfile("LAB")
t = ImageCms.buildTransform(pLab, psRGB, "LAB", "RGB")
with pytest.raises(ValueError, match="mode mismatch"):
t.apply(hopper("RGBA"))
with pytest.raises(ValueError, match="mode mismatch"):
t.apply(hopper("LAB"), hopper("RGBA"))
with pytest.raises(ValueError, match="mode mismatch"):
t.apply_in_place(hopper("RGBA"))

Expand Down
16 changes: 9 additions & 7 deletions src/PIL/ImageCms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,19 +317,21 @@ def point(self, im: Image.Image) -> Image.Image:
return self.apply(im)

def apply(self, im: Image.Image, imOut: Image.Image | None = None) -> Image.Image:
if imOut is None:
if im.mode != self.input_mode:
msg = "mode mismatch"
raise ValueError(msg)
if imOut is not None:
if imOut.mode != self.output_mode:
msg = "mode mismatch"
raise ValueError(msg)
else:
imOut = Image.new(self.output_mode, im.size, None)
self.transform.apply(im.getim(), imOut.getim())
imOut.info["icc_profile"] = self.output_profile.tobytes()
return imOut

def apply_in_place(self, im: Image.Image) -> Image.Image:
if im.mode != self.output_mode:
msg = "mode mismatch"
raise ValueError(msg) # wrong output mode
self.transform.apply(im.getim(), im.getim())
im.info["icc_profile"] = self.output_profile.tobytes()
return im
return self.apply(im, im)


def get_display_profile(handle: SupportsInt | None = None) -> ImageCmsProfile | None:
Expand Down
Loading