Fixed bug in image handling of uint8 array

efiring · efiring · commit 1ca227988151 · 2007-04-06T22:18:25.000Z
svn path=/trunk/matplotlib/; revision=3165
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -117,7 +117,7 @@ def make_image(self, magnification=1.0):
             raise RuntimeError('You must first set the image array or the image attribute')
 
         if self._imcache is None:
-            if typecode(self._A) == UInt8:
+            if typecode(self._A) == UInt8 and len(self._A.shape) == 3:
                 im = _image.frombyte(self._A, 0)
                 im.is_grayscale = False
             else:
diff --git a/src/_image.cpp b/src/_image.cpp
@@ -1200,7 +1200,8 @@ _image_module::frombyte(const Py::Tuple& args) {
   int isoutput = Py::Int(args[1]);
 
   PyArrayObject *A = (PyArrayObject *) PyArray_ContiguousFromObject(x.ptr(), PyArray_UBYTE, 3, 3);
-
+  if (A == NULL)
+      throw Py::ValueError("Array must have 3 dimensions");
   if (A->dimensions[2]<3 || A->dimensions[2]>4)
       throw Py::ValueError("Array dimension 3 must have size 3 or 4");
 
@@ -1317,7 +1318,7 @@ _image_module::frombuffer(const Py::Tuple& args) {
     imo->rbufIn->attach(buffer, imo->colsIn, imo->rowsIn, imo->colsIn*imo->BPP);
   }
 
-  return Py::asObject(imo); 
+  return Py::asObject(imo);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -1200,7 +1200,8 @@ _image_module::frombyte(const Py::Tuple& args) {`
`1200`	`1200`	`int isoutput = Py::Int(args[1]);`
`1201`	`1201`
`1202`	`1202`	`PyArrayObject A = (PyArrayObject ) PyArray_ContiguousFromObject(x.ptr(), PyArray_UBYTE, 3, 3);`
`1203`		`-`
	`1203`	`+ if (A == NULL)`
	`1204`	`+ throw Py::ValueError("Array must have 3 dimensions");`
`1204`	`1205`	`if (A->dimensions[2]<3 \|\| A->dimensions[2]>4)`
`1205`	`1206`	`throw Py::ValueError("Array dimension 3 must have size 3 or 4");`
`1206`	`1207`
`@@ -1317,7 +1318,7 @@ _image_module::frombuffer(const Py::Tuple& args) {`
`1317`	`1318`	`imo->rbufIn->attach(buffer, imo->colsIn, imo->rowsIn, imo->colsIn*imo->BPP);`
`1318`	`1319`	`}`
`1319`	`1320`
`1320`		`- return Py::asObject(imo);`
	`1321`	`+ return Py::asObject(imo);`
`1321`	`1322`	`}`
`1322`	`1323`
`1323`	`1324`