From 4f99aafa969056a3f51ff4fad9486b866870102e Mon Sep 17 00:00:00 2001 From: Ankit Agrawal Date: Thu, 22 Aug 2013 04:06:56 +0530 Subject: [PATCH] Wrapping lines; returning corner_response at a pixel --- skimage/feature/corner_cy.pyx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/skimage/feature/corner_cy.pyx b/skimage/feature/corner_cy.pyx index 3c4f2f19..d8c97f25 100644 --- a/skimage/feature/corner_cy.pyx +++ b/skimage/feature/corner_cy.pyx @@ -82,7 +82,6 @@ def corner_moravec(image, Py_ssize_t window_size=1): return np.asarray(out) -<<<<<<< HEAD cdef inline double _corner_fast_response(double curr_pixel, double* circle_intensities, char* bins, char state, char n): @@ -112,8 +111,9 @@ def _corner_fast(double[:, ::1] image, char n, double threshold): cdef char speed_sum_b, speed_sum_d cdef double curr_pixel cdef double lower_threshold, upper_threshold - cdef double[:, ::1] corner_response = np.empty((rows, cols), + cdef double[:, ::1] corner_response = np.zeros((rows, cols), dtype=np.double) + cdef char *rp = [0, 1, 2, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -2, -1] cdef char *cp = [3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -2, -1, 0, 1, 2, 3] cdef char bins[16] @@ -150,7 +150,6 @@ def _corner_fast(double[:, ::1] image, char n, double threshold): elif bins[k] == 'd': speed_sum_d += 1 if speed_sum_d < 3 and speed_sum_b < 3: - corner_response[i, j] = 0 continue curr_response = \