From 50a27088b1794f8cc0a332102fd61cf7272f2ea5 Mon Sep 17 00:00:00 2001 From: Ankit Agrawal Date: Wed, 12 Feb 2014 19:15:03 +0530 Subject: [PATCH 1/3] Correcting the strides of response in _filter_image --- skimage/feature/censure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skimage/feature/censure.py b/skimage/feature/censure.py index 24d7e62d..eb69f115 100644 --- a/skimage/feature/censure.py +++ b/skimage/feature/censure.py @@ -37,7 +37,7 @@ def _filter_image(image, min_scale, max_scale, mode): # make response[:, :, i] contiguous memory block item_size = response.itemsize - response.strides = (item_size * response.shape[0], item_size, + response.strides = (item_size * response.shape[1], item_size, item_size * response.shape[0] * response.shape[1]) integral_img = integral_image(image) From 292f9dce9b7a5c41bb4f02e9f5d8897a1c915dcf Mon Sep 17 00:00:00 2001 From: Ankit Agrawal Date: Wed, 12 Feb 2014 19:17:54 +0530 Subject: [PATCH 2/3] Fix regionprops doc typo --- skimage/measure/_regionprops.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skimage/measure/_regionprops.py b/skimage/measure/_regionprops.py index ef1086da..5817580d 100644 --- a/skimage/measure/_regionprops.py +++ b/skimage/measure/_regionprops.py @@ -399,7 +399,7 @@ def regionprops(label_image, properties=None, **major_axis_length** : float The length of the major axis of the ellipse that has the same normalized second central moments as the region. - **min_intensity** : float + **max_intensity** : float Value with the greatest intensity in the region. **mean_intensity** : float Value with the mean intensity in the region. From d8589f00e112541b46c389646d96188adbf7165f Mon Sep 17 00:00:00 2001 From: Ankit Agrawal Date: Wed, 12 Feb 2014 20:53:22 +0530 Subject: [PATCH 3/3] Adding test to check Censure works on any 2D shape --- skimage/feature/tests/test_censure.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/skimage/feature/tests/test_censure.py b/skimage/feature/tests/test_censure.py index f1d88f3d..53c1c59b 100644 --- a/skimage/feature/tests/test_censure.py +++ b/skimage/feature/tests/test_censure.py @@ -7,6 +7,14 @@ from skimage.feature import CENSURE img = moon() +def test_censure_on_rectangular_images(): + """Censure feature detector should work on 2D image of any shape.""" + rect_image = np.random.random((300, 200)) + square_image = np.random.random((200, 200)) + CENSURE().detect((square_image)) + CENSURE().detect((rect_image)) + + def test_keypoints_censure_color_image_unsupported_error(): """Censure keypoints can be extracted from gray-scale images only.""" assert_raises(ValueError, CENSURE().detect, np.zeros((20, 20, 3)))