From 4bdde3d2aef2dd184e0b907983a15167326aec55 Mon Sep 17 00:00:00 2001 From: Tim Seifert Date: Wed, 4 Feb 2015 12:24:20 -0600 Subject: [PATCH 1/2] load correct _frame_index --- skimage/io/collection.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skimage/io/collection.py b/skimage/io/collection.py index da2bfda8..dccd88c8 100644 --- a/skimage/io/collection.py +++ b/skimage/io/collection.py @@ -254,7 +254,7 @@ class ImageCollection(object): if ((self.conserve_memory and n != self._cached) or (self.data[idx] is None)): if self._frame_index: - fname, img_num = self._frame_index[idx] + fname, img_num = self._frame_index[n] self.data[idx] = self.load_func(fname, img_num=img_num, **self.load_func_kwargs) else: From 3748557ac9115eefab16b57268bc5c225ce5d7c4 Mon Sep 17 00:00:00 2001 From: Tim Seifert Date: Wed, 4 Feb 2015 22:59:19 -0600 Subject: [PATCH 2/2] fix for concatenate test --- skimage/io/tests/test_multi_image.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/skimage/io/tests/test_multi_image.py b/skimage/io/tests/test_multi_image.py index 6542ab2e..76a71ec2 100644 --- a/skimage/io/tests/test_multi_image.py +++ b/skimage/io/tests/test_multi_image.py @@ -50,6 +50,10 @@ class TestMultiImage(): assert type(img[i]) is np.ndarray assert_allclose(img[0], img[-num]) + assert_raises(AssertionError, + assert_allclose, + img[0], img[1]) + # assert_raises expects a callable, hence this thin wrapper function. def return_img(n): return img[n] @@ -77,6 +81,9 @@ class TestMultiImage(): def test_concatenate(self): for img in self.imgs: + if img[0].shape != img[-1].shape: + assert_raises(ValueError, img.concatenate) + continue array = img.concatenate() assert_equal(array.shape, (len(img),) + img[0].shape)