Merged revisions 8601 via svnmerge from

mdboom · mdboom · commit 4947ee865f7e · 2010-07-30T18:58:18.000Z
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint ........ r8601 | mdboom | 2010-07-30 14:56:18 -0400 (Fri, 30 Jul 2010) | 2 lines [3036982] imsave: wrong image size ........ svn path=/trunk/matplotlib/; revision=8602
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -1225,7 +1225,7 @@ def imsave(fname, arr, vmin=None, vmax=None, cmap=None, format=None,
     from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
     from matplotlib.figure import Figure
 
-    figsize = [x / float(dpi) for x in arr.shape]
+    figsize = [x / float(dpi) for x in arr.shape[::-1]]
     fig = Figure(figsize=figsize, dpi=dpi, frameon=False)
     canvas = FigureCanvas(fig)
     im = fig.figimage(arr, cmap=cmap, vmin=vmin, vmax=vmax, origin=origin)
diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
@@ -77,22 +77,23 @@ def test_imsave():
     # the data is 100% identical.
     from numpy import random
     random.seed(1)
-    data = random.rand(256, 256)
+    data = random.rand(256, 128)
 
     buff_dpi1 = cStringIO.StringIO()
     plt.imsave(buff_dpi1, data, dpi=1)
-    plt.imsave("test_dpi1.png", data, dpi=1)
 
     buff_dpi100 = cStringIO.StringIO()
     plt.imsave(buff_dpi100, data, dpi=100)
-    plt.imsave("test_dpi100.png", data, dpi=1)
 
     buff_dpi1.seek(0)
     arr_dpi1 = plt.imread(buff_dpi1)
 
     buff_dpi100.seek(0)
     arr_dpi100 = plt.imread(buff_dpi100)
 
+    assert arr_dpi1.shape == (256, 128, 4)
+    assert arr_dpi100.shape == (256, 128, 4)
+
     assert_array_equal(arr_dpi1, arr_dpi100)
 
 @image_comparison(baseline_images=['image_clip'])
