Merge pull request #5324 from mdboom/transparent-jpg

tacaswell · QuLogic · commit 1e437d347fbe · 2016-10-15T23:30:39.000-04:00
Fix #5302: Proper alpha-blending for jpeg Conflicts: lib/matplotlib/tests/test_image.py
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -38,6 +38,7 @@
 from matplotlib.mathtext import MathTextParser
 from matplotlib.path import Path
 from matplotlib.transforms import Bbox, BboxBase
+from matplotlib import colors as mcolors
 
 from matplotlib.backends._backend_agg import RendererAgg as _RendererAgg
 from matplotlib import _png
@@ -571,7 +572,6 @@ def print_to_buffer(self):
         return result
 
     if _has_pil:
-
         # add JPEG support
         def print_jpg(self, filename_or_obj, *args, **kwargs):
             """
@@ -593,14 +593,21 @@ def print_jpg(self, filename_or_obj, *args, **kwargs):
             buf, size = self.print_to_buffer()
             if kwargs.pop("dryrun", False):
                 return
+            # The image is "pasted" onto a white background image to safely
+            # handle any transparency
             image = Image.frombuffer('RGBA', size, buf, 'raw', 'RGBA', 0, 1)
+            color = mcolors.colorConverter.to_rgb(
+                rcParams.get('savefig.facecolor', 'white'))
+            color = tuple([int(x * 255.0) for x in color])
+            background = Image.new('RGB', size, color)
+            background.paste(image, image)
             options = restrict_dict(kwargs, ['quality', 'optimize',
                                              'progressive'])
 
             if 'quality' not in options:
                 options['quality'] = rcParams['savefig.jpeg_quality']
 
-            return image.save(filename_or_obj, format='jpeg', **options)
+            return background.save(filename_or_obj, format='jpeg', **options)
         print_jpeg = print_jpg
 
         # add TIFF support
diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
@@ -15,7 +15,7 @@
 from matplotlib.image import (BboxImage, imread, NonUniformImage,
                               AxesImage, FigureImage, PcolorImage)
 from matplotlib.transforms import Bbox, Affine2D, TransformedBbox
-from matplotlib import rcParams
+from matplotlib import rcParams, rc_context
 from matplotlib import patches
 import matplotlib.pyplot as plt
 
@@ -35,7 +35,6 @@
 
 try:
     from PIL import Image
-    del Image
     HAS_PIL = True
 except ImportError:
     HAS_PIL = False
@@ -494,6 +493,34 @@ def test_nonuniformimage_setnorm():
     im.set_norm(plt.Normalize())
 
 
+@knownfailureif(not HAS_PIL)
+@cleanup
+def test_jpeg_alpha():
+    plt.figure(figsize=(1, 1), dpi=300)
+    # Create an image that is all black, with a gradient from 0-1 in
+    # the alpha channel from left to right.
+    im = np.zeros((300, 300, 4), dtype=float)
+    im[..., 3] = np.linspace(0.0, 1.0, 300)
+
+    plt.figimage(im)
+
+    buff = io.BytesIO()
+    with rc_context({'savefig.facecolor': 'red'}):
+        plt.savefig(buff, transparent=True, format='jpg', dpi=300)
+
+    buff.seek(0)
+    image = Image.open(buff)
+
+    # If this fails, there will be only one color (all black). If this
+    # is working, we should have all 256 shades of grey represented.
+    num_colors = len(image.getcolors(256))
+    assert 175 <= num_colors <= 185, 'num colors: %d' % (num_colors, )
+    # The fully transparent part should be red, not white or black
+    # or anything else
+    corner_pixel = image.getpixel((0, 0))
+    assert corner_pixel == (254, 0, 0), "corner pixel: %r" % (corner_pixel, )
+
+
 @cleanup
 def test_nonuniformimage_setdata():
     ax = plt.gca()
