Merge tag '0.25.8' into develop

CHANGELOG

@@ -2,6 +2,11 @@
 ChangeLog
 *********
 
+0.25.8 (2018-05-25)
+===================
+- Fix: Render paletted pngs by converting them to RGB before saving as jpeg.
+- Code: Fix flake errors unrelated to this hotfix that were causing CI failures.
+
 0.25.7 (2018-05-08)
 ===================
 - Feature: Allow settings config variables from the environment via JSON strings.  (thanks,

mfr/extensions/image/export.py

@@ -44,6 +44,13 @@ def export(self):
                     image = image.resize((round(image.size[0] * ratio),
                                           round(image.size[1] * ratio)), Image.ANTIALIAS)
 
+            # Mode 'P' is for paletted images. They must be converted to RGB before exporting to
+            # jpeg, otherwise Pillow will throw an error.  This is a temporary workaround, as the
+            # conversion is imprecise and can be ugly.
+            # See: https://stackoverflow.com/q/21669657
+            if image.mode == 'P':
+                image = image.convert('RGB')
+
             # handle transparency
             # from https://github.com/python-pillow/Pillow/issues/2609
             if image.mode in ('RGBA', 'RGBa', 'LA') and type in ['jpeg', 'jpg']:

mfr/version.py

@@ -1 +1 @@
-__version__ = '0.25.7'
+__version__ = '0.25.8'