From 4f109d18e2542d8308366cc82678d53b57bbe7fb Mon Sep 17 00:00:00 2001 From: Ankit Agrawal Date: Thu, 8 Aug 2013 23:55:44 +0530 Subject: [PATCH] Returning mask in _remove_border_keypoints --- skimage/feature/util.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/skimage/feature/util.py b/skimage/feature/util.py index f327cff5..c644af50 100644 --- a/skimage/feature/util.py +++ b/skimage/feature/util.py @@ -1,4 +1,3 @@ -import numpy as np def _remove_border_keypoints(image, keypoints, dist): @@ -6,14 +5,12 @@ def _remove_border_keypoints(image, keypoints, dist): width = image.shape[0] height = image.shape[1] - try: - keypoints = keypoints[(dist - 1 < keypoints[:, 0]) - & (keypoints[:, 0] < width - dist + 1) - & (dist - 1 < keypoints[:, 1]) - & (keypoints[:, 1] < height - dist + 1)] - except IndexError: - return np.empty((0, 2), dtype=np.int32) - return keypoints + keypoints_filtering_mask = (dist - 1 < keypoints[:, 0] + & keypoints[:, 0] < width - dist + 1 + & dist - 1 < keypoints[:, 1] + & keypoints[:, 1] < height - dist + 1) + + return keypoints_filtering_mask def pairwise_hamming_distance(array1, array2):