From c18373f3ad7693b48ec2104ad67d38545a1e4a20 Mon Sep 17 00:00:00 2001 From: "Josh Warner (Mac)" Date: Fri, 28 Jun 2013 17:53:14 -0500 Subject: [PATCH] Use memoryviews in skimage.transform --- skimage/_shared/transform.pxd | 4 ++-- skimage/_shared/transform.pyx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/skimage/_shared/transform.pxd b/skimage/_shared/transform.pxd index ccb16ff3..4978e843 100644 --- a/skimage/_shared/transform.pxd +++ b/skimage/_shared/transform.pxd @@ -1,5 +1,5 @@ cimport numpy as cnp -cdef float integrate(cnp.ndarray[float, ndim=2, mode="c"] sat, - Py_ssize_t r0, Py_ssize_t c0, Py_ssize_t r1, Py_ssize_t c1) +cdef float integrate(float[:, ::1] sat, Py_ssize_t r0, Py_ssize_t c0, + Py_ssize_t r1, Py_ssize_t c1) diff --git a/skimage/_shared/transform.pyx b/skimage/_shared/transform.pyx index 8ce2ab67..9bdc6824 100644 --- a/skimage/_shared/transform.pyx +++ b/skimage/_shared/transform.pyx @@ -5,8 +5,8 @@ cimport numpy as cnp -cdef float integrate(cnp.ndarray[float, ndim=2, mode="c"] sat, - Py_ssize_t r0, Py_ssize_t c0, Py_ssize_t r1, Py_ssize_t c1): +cdef float integrate(float[:, ::1] sat, Py_ssize_t r0, Py_ssize_t c0, + Py_ssize_t r1, Py_ssize_t c1): """ Using a summed area table / integral image, calculate the sum over a given window.