From a9e05e5fd43859fece29db6542933d61fe43fec4 Mon Sep 17 00:00:00 2001 From: Olivier Debeir Date: Mon, 29 Oct 2012 09:14:50 +0100 Subject: [PATCH] remove inlines in pxd --- skimage/filter/rank/_core16.pxd | 6 +++--- skimage/filter/rank/_core8.pxd | 6 +++--- skimage/setup.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/skimage/filter/rank/_core16.pxd b/skimage/filter/rank/_core16.pxd index a113f2b0..9590e277 100644 --- a/skimage/filter/rank/_core16.pxd +++ b/skimage/filter/rank/_core16.pxd @@ -5,10 +5,10 @@ cimport numpy as np #--------------------------------------------------------------------------- # generic cdef functions -cdef inline int int_max(int a, int b) -cdef inline int int_min(int a, int b) +cdef int int_max(int a, int b) +cdef int int_min(int a, int b) -cdef inline _core16( +cdef _core16( np.uint16_t kernel(Py_ssize_t * , float, np.uint16_t, Py_ssize_t, Py_ssize_t, Py_ssize_t, float, float, Py_ssize_t, Py_ssize_t), np.ndarray[np.uint16_t, ndim=2] image, np.ndarray[np.uint8_t, ndim=2] selem, diff --git a/skimage/filter/rank/_core8.pxd b/skimage/filter/rank/_core8.pxd index 8ecf7263..9f898faa 100644 --- a/skimage/filter/rank/_core8.pxd +++ b/skimage/filter/rank/_core8.pxd @@ -1,14 +1,14 @@ cimport numpy as np # generic cdef functions -cdef inline np.uint8_t uint8_max(np.uint8_t a, np.uint8_t b) -cdef inline np.uint8_t uint8_min(np.uint8_t a, np.uint8_t b) +cdef np.uint8_t uint8_max(np.uint8_t a, np.uint8_t b) +cdef np.uint8_t uint8_min(np.uint8_t a, np.uint8_t b) #--------------------------------------------------------------------------- # 8 bit core kernel receives extra information about data inferior and superior percentiles #--------------------------------------------------------------------------- -cdef inline _core8( +cdef _core8( np.uint8_t kernel(Py_ssize_t *, float, np.uint8_t, float, float, Py_ssize_t, Py_ssize_t), np.ndarray[np.uint8_t, ndim=2] image, np.ndarray[np.uint8_t, ndim=2] selem, diff --git a/skimage/setup.py b/skimage/setup.py index 7ed50b65..96497fa9 100644 --- a/skimage/setup.py +++ b/skimage/setup.py @@ -12,11 +12,11 @@ def configuration(parent_package='', top_path=None): config.add_subpackage('draw') config.add_subpackage('feature') config.add_subpackage('filter') + config.add_subpackage('filter/rank') config.add_subpackage('graph') config.add_subpackage('io') config.add_subpackage('measure') config.add_subpackage('morphology') - config.add_subpackage('rank') config.add_subpackage('transform') config.add_subpackage('util') config.add_subpackage('segmentation')