mend

cbreeden · cbreeden · commit 5af94d2c892d · 2015-11-07T09:03:04.000-06:00
Add tests for flatten kwarg and fix (h, w) consistency
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -514,7 +514,7 @@ def print_raw(self, filename_or_obj, *args, **kwargs):
         # Flatten RGBA if used with fileformat that doesn't handle trnasparency
         if kwargs.get('flatten', False):
             w, h = int(renderer.width), int(renderer.height)
-            img = np.array(memoryview(img)).reshape((w, h, 4))
+            img = np.array(memoryview(img)).reshape((h, w, 4))
             img = mimage.flatten_rgba(img)
 
         try:
@@ -581,7 +581,7 @@ def print_jpg(self, filename_or_obj, *args, **kwargs):
                 should be stored as a progressive JPEG file.
             """
             buf, (w, h) = self.print_to_buffer()
-            buf = np.array(memoryview(buf)).reshape((w, h, 4))
+            buf = np.array(memoryview(buf)).reshape((h, w, 4))
 
             if kwargs.pop("dryrun", False):
                 return
