Revision: 8601
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8601&view=rev
Author: mdboom
Date: 2010-07-30 18:56:18 +0000 (Fri, 30 Jul 2010)
Log Message:
-----------
[3036982] imsave: wrong image size
Modified Paths:
--------------
branches/v1_0_maint/lib/matplotlib/image.py
branches/v1_0_maint/lib/matplotlib/tests/test_image.py
Modified: branches/v1_0_maint/lib/matplotlib/image.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/image.py 2010-07-30 18:47:19 UTC (rev
8600)
+++ branches/v1_0_maint/lib/matplotlib/image.py 2010-07-30 18:56:18 UTC (rev
8601)
@@ -1225,7 +1225,7 @@
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)
Modified: branches/v1_0_maint/lib/matplotlib/tests/test_image.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/tests/test_image.py 2010-07-30
18:47:19 UTC (rev 8600)
+++ branches/v1_0_maint/lib/matplotlib/tests/test_image.py 2010-07-30
18:56:18 UTC (rev 8601)
@@ -77,15 +77,13 @@
# 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)
@@ -93,6 +91,9 @@
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'])
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://p.sf.net/sfu/dev2dev-palm
_______________________________________________
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
