Merge pull request #685 from fiee/master

matthiask · web-flow · commit e923d0466b74 · 2020-04-06T09:04:20.000+02:00
JPEGs can’t be in RGBA mode
diff --git a/feincms/templatetags/feincms_thumbnail.py b/feincms/templatetags/feincms_thumbnail.py
@@ -128,10 +128,13 @@ def generate(self, storage, original, size, miniature):
                 format = image.format  # Save format for the save() call later
                 image.thumbnail([w, h], Image.ANTIALIAS)
                 buf = BytesIO()
-                if image.mode not in ("RGBA", "RGB", "L"):
-                    image = image.convert("RGBA")
                 if format.lower() not in ("jpg", "jpeg", "png"):
                     format = "jpeg"
+                if image.mode not in ("RGBA", "RGB", "L"):
+                    if format == "png":
+                        image = image.convert("RGBA")
+                    else:
+                        image = image.convert("RGB")
                 image.save(buf, format, quality=90)
                 raw_data = buf.getvalue()
                 buf.close()
@@ -186,10 +189,13 @@ def generate(self, storage, original, size, miniature):
                 image = image.resize((dst_width, dst_height), Image.ANTIALIAS)
 
                 buf = BytesIO()
-                if image.mode not in ("RGBA", "RGB", "L"):
-                    image = image.convert("RGBA")
                 if format.lower() not in ("jpg", "jpeg", "png"):
                     format = "jpeg"
+                if image.mode not in ("RGBA", "RGB", "L"):
+                    if format == "png":
+                        image = image.convert("RGBA")
+                    else:
+                        image = image.convert("RGB")
                 image.save(buf, format, quality=90)
                 raw_data = buf.getvalue()
                 buf.close()
