[static] fix png transparency

rande · rande · commit 37f8aa1783cf · 2014-10-06T21:29:07.000+02:00
diff --git a/element/plugins/static/static.py b/element/plugins/static/static.py
@@ -74,9 +74,7 @@ def image_fit(self, request_handler, context, file):
         if not os.path.exists("%s/%s" % (path, filename)):
             image, format = self.fix_orientation(Image.open(file))
 
-            # ImageOps compatible mode
-            if image.mode not in ("L", "RGB"):
-                image = image.convert("RGB")
+            image = self.fix_color(image, format)
 
             request_handler.send_file_header(file)
 
@@ -102,9 +100,7 @@ def image_resize(self, request_handler, context, file):
         if not os.path.exists("%s/%s" % (path, filename)):
             image, format = self.fix_orientation(Image.open(file))
 
-            # ImageOps compatible mode
-            if image.mode not in ("L", "RGB"):
-                image = image.convert("RGB")
+            image = self.fix_color(image, format)
 
             if image.size[0] > w:
                 image = ImageOps.fit(image, (w, int(w * image.size[1] / image.size[0])), Image.ANTIALIAS)
@@ -125,6 +121,13 @@ def make_temp_path(self, path):
 
         return path
 
+    def fix_color(self, image, format):
+        # ImageOps compatible mode
+        if format in ["JPEG"] and image.mode not in ("L", "RGB"):
+            image = image.convert("RGB")
+
+        return image
+
     def fix_orientation(self, image):
 
         try:
