Fix: Pillow error when uploading RGBA image (#3325) (#6241)

Signed-Off-By: Filip Štědronský <[email protected]>
matrix-org · Dec 2, 2019 · 81731c6 · 81731c6
1 parent 23ea572
commit 81731c6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/changelog.d/6241.bugfix b/changelog.d/6241.bugfix
@@ -0,0 +1 @@
+Fix error from the Pillow library when uploading RGBA images.
diff --git a/synapse/rest/media/v1/thumbnailer.py b/synapse/rest/media/v1/thumbnailer.py
@@ -129,5 +129,8 @@ def crop(self, width, height, output_type):
 
     def _encode_image(self, output_image, output_type):
         output_bytes_io = BytesIO()
-        output_image.save(output_bytes_io, self.FORMATS[output_type], quality=80)
+        fmt = self.FORMATS[output_type]
+        if fmt == "JPEG":
+            output_image = output_image.convert("RGB")
+        output_image.save(output_bytes_io, fmt, quality=80)
         return output_bytes_io
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix error from the Pillow library when uploading RGBA images.