ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update imageToArray to support Py2.6 + Qt 4.10

Browse Source
This commit is contained in:
Luke Campagnola 2014-02-17 20:02:03 -05:00
parent 210d07027e
commit d67464af72
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pyqtgraph/functions.py
View File

@ -993,6 +993,10 @@ def imageToArray(img, copy=False, transpose=True):
else: else:
ptr.setsize(img.byteCount()) ptr.setsize(img.byteCount())
arr = np.asarray(ptr) arr = np.asarray(ptr)
if img.byteCount() != arr.size * arr.itemsize:
# Required for Python 2.6, PyQt 4.10
# If this works on all platforms, then there is no need to use np.asarray..
arr = np.frombuffer(ptr, np.ubyte, img.byteCount())
if fmt == img.Format_RGB32: if fmt == img.Format_RGB32:
arr = arr.reshape(img.height(), img.width(), 3) arr = arr.reshape(img.height(), img.width(), 3)