wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-11 23:08:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't return an alpha channel if it's not present. Fix return type of as_grey

Browse Source
This commit is contained in:
Neil
2011-07-16 21:32:31 +02:00
parent f260a47573
commit c266290b5d
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scikits/image/io/_plugins/qt_plugin.py
+9 -3
View File
@@ -107,11 +107,17 @@ def imread_qt(filename, as_grey=False):
else:
img = img.reshape((qtimg.height(), pixelsPerLine))
img = img[:, :qtimg.width()]
# Strip alpha channel if needed
if bytesPerPixel == 4 and not qtimg.hasAlphaChannel():
img = img[:, :, 0:3]
if as_grey and bytesPerPixel > 1:
# Stolen from fits_plugin
# these are the values that wikipedia says are typical
transform = numpy.array([ 0.30, 0.59, 0.11])
return numpy.dot(img, transform)
if img.shape[2] == 4:
# these are the values that wikipedia says are typical
transform = np.array([ 0.30, 0.59, 0.11, 0])
else:
transform = np.array([ 0.30, 0.59, 0.11])
return np.dot(img, transform).astype('uint8')
return img
if sip.SIP_VERSION >= 0x040c00: