Skip to content

Commit

Permalink
Fix saving of non-RGB thumbnails as PNG
Browse files Browse the repository at this point in the history
The PNG format does not support non-RGB color spaces, which makes pillow
raise an exception when trying to save e.g. a CMYK image in PNG format.

Converting to RGB is recommended on the upstream issue, and as CMYK is a
print format transparency does not need to be considered.

Closes: element-hq#10741
  • Loading branch information
mweinelt committed Sep 20, 2024
1 parent 75e2c17 commit 81c7978
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions changelog.d/17736.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix saving of PNG thumbnails, when the original image is in the CMYK color space.
2 changes: 1 addition & 1 deletion synapse/media/thumbnailer.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ def crop(self, width: int, height: int, output_type: str) -> BytesIO:
def _encode_image(self, output_image: Image.Image, output_type: str) -> BytesIO:
output_bytes_io = BytesIO()
fmt = self.FORMATS[output_type]
if fmt == "JPEG":
if fmt == "JPEG" or fmt == "PNG" and output_image.mode == "CMYK":
output_image = output_image.convert("RGB")
output_image.save(output_bytes_io, fmt, quality=80)
return output_bytes_io
Expand Down

0 comments on commit 81c7978

Please sign in to comment.