[Scipy-svn] r2105 - trunk/Lib/misc

[scipy-svn at scipy.org]

Author: cookedm
Date: 2006-07-14 17:26:16 -0500 (Fri, 14 Jul 2006)
New Revision: 2105

Modified:
   trunk/Lib/misc/pilutil.py
Log:
Handle 16-bit images from PIL


Modified: trunk/Lib/misc/pilutil.py
===================================================================
--- trunk/Lib/misc/pilutil.py	2006-07-14 21:55:34 UTC (rev 2104)
+++ trunk/Lib/misc/pilutil.py	2006-07-14 22:26:16 UTC (rev 2105)
@@ -69,9 +69,10 @@
     type = uint8
     if mode == 'F':
         type = numpy.float32
-    if mode == 'I':
+    elif mode == 'I':
         type = numpy.uint32
-        type = 'I'
+    elif mode == 'I;16':
+        type = numpy.uint16
     arr = numpy.fromstring(str,type)
     shape = list(im.size)
     shape.reverse()