From 2966e262a39c768b70180b264ab8df761c7e6f9c Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 12 Dec 2014 09:39:08 -0600 Subject: [PATCH] Fix handling of singleton frames in pil_to_ndarray --- skimage/io/_plugins/pil_plugin.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/skimage/io/_plugins/pil_plugin.py b/skimage/io/_plugins/pil_plugin.py index 3fff941e..5018be49 100644 --- a/skimage/io/_plugins/pil_plugin.py +++ b/skimage/io/_plugins/pil_plugin.py @@ -112,10 +112,12 @@ def pil_to_ndarray(im, dtype=None, img_num=None): if hasattr(im, 'fp') and im.fp: im.fp.close() - if img_num is None: + if img_num is None and len(frames) > 1: return np.array(frames) - else: + elif frames: return frames[0] + elif img_num: + raise IndexError('Could not find image #%s' % img_num) def _palette_is_grayscale(pil_image):