Merge pull request #616

mdboom · mdboom · commit 14a4386723c8 · 2012-06-05T14:20:05.000-04:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2012-06-05 Images loaded through PIL are now ordered correctly - CG
+
 2012-06-02 Add new Axes method and pyplot function, hist2d. - PO
 
 2012-05-29 pcolormesh now obeys the passed in "edgecolor" kwarg.
diff --git a/examples/pylab_examples/image_demo3.py b/examples/pylab_examples/image_demo3.py
@@ -15,7 +15,7 @@
 figure(figsize=figsize)
 ax = axes([0,0,1,1], frameon=False)
 ax.set_axis_off()
-im = imshow(lena, origin='lower')
+im = imshow(lena)
 
 show()
 
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -5,6 +5,7 @@
 """
 from __future__ import division, print_function
 import os, warnings
+import math
 
 import numpy as np
 from numpy import ma
@@ -325,7 +326,7 @@ def _draw_unsampled_image(self, renderer, gc):
 
         im._url = self.get_url()
         im._gid = self.get_gid()
-        
+
         renderer.draw_image(gc, xmin, ymin, im, dxintv, dyintv,
                             trans_ic_to_canvas)
 
@@ -1184,6 +1185,9 @@ def pilread():
         if cbook.is_string_like(fname):
             basename, ext = os.path.splitext(fname)
             ext = ext.lower()[1:]
+        elif hasattr(fname, 'name'):
+            basename, ext = os.path.splitext(fname.name)
+            ext = ext.lower()[1:]
         else:
             ext = 'png'
     else:
@@ -1251,14 +1255,14 @@ def imsave(fname, arr, vmin=None, vmax=None, cmap=None, format=None,
 
 def pil_to_array( pilImage ):
     """
-    load a PIL image and return it as a numpy array of uint8.  For
-    grayscale images, the return array is MxN.  For RGB images, the
-    return value is MxNx3.  For RGBA images the return value is MxNx4
+    Load a PIL image and return it as a numpy array.  For grayscale
+    images, the return array is MxN.  For RGB images, the return value
+    is MxNx3.  For RGBA images the return value is MxNx4
     """
-    def toarray(im):
-        """Teturn a 1D array of floats."""
-        x_str = im.tostring('raw',im.mode,0,-1)
-        x = np.fromstring(x_str,np.uint8)
+    def toarray(im, dtype=np.uint8):
+        """Teturn a 1D array of dtype."""
+        x_str = im.tostring('raw', im.mode)
+        x = np.fromstring(x_str, dtype)
         return x
 
     if pilImage.mode in ('RGBA', 'RGBX'):
@@ -1275,7 +1279,15 @@ def toarray(im):
         x = toarray(im)
         x.shape = im.size[1], im.size[0], 3
         return x
-
+    elif pilImage.mode.startswith('I;16'):
+        # return MxN luminance array of uint16
+        im = pilImage
+        if im.mode.endswith('B'):
+            x = toarray(im, '>u2')
+        else:
+            x = toarray(im, '<u2')
+        x.shape = im.size[1], im.size[0]
+        return x.astype('=u2')
     else: # try to convert to an rgba image
         try:
             im = pilImage.convert('RGBA')
diff --git a/lib/matplotlib/tests/baseline_images/test_image/uint16.tif b/lib/matplotlib/tests/baseline_images/test_image/uint16.tif
diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
@@ -76,6 +76,12 @@ def test_image_python_io():
     buffer.seek(0)
     plt.imread(buffer)
 
+def test_imread_pil_uint16():
+    img = plt.imread(os.path.join(os.path.dirname(__file__),
+                     'baseline_images/test_image/uint16.tif'))
+    assert (img.dtype == np.uint16)
+    assert np.sum(img) == 134184960
+
 # def test_image_unicode_io():
 #     fig = plt.figure()
 #     ax = fig.add_subplot(111)

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+2012-06-05 Images loaded through PIL are now ordered correctly - CG`
	`2`	`+`
`1`	`3`	`2012-06-02 Add new Axes method and pyplot function, hist2d. - PO`
`2`	`4`
`3`	`5`	`2012-05-29 pcolormesh now obeys the passed in "edgecolor" kwarg.`