From 97d595eb6179166d77fc1b424ee3087ec34d78e2 Mon Sep 17 00:00:00 2001 From: cgohlke Date: Sat, 29 Sep 2012 15:49:30 -0700 Subject: [PATCH 1/2] Fix: 'inline' not permitted on data declarations --- skimage/_shared/interpolation.pxd | 36 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/skimage/_shared/interpolation.pxd b/skimage/_shared/interpolation.pxd index ef880109..f43ff25e 100644 --- a/skimage/_shared/interpolation.pxd +++ b/skimage/_shared/interpolation.pxd @@ -1,24 +1,24 @@ -cdef inline double nearest_neighbour_interpolation(double* image, int rows, - int cols, double r, - double c, char mode, - double cval) +cdef double nearest_neighbour_interpolation(double* image, int rows, + int cols, double r, + double c, char mode, + double cval) -cdef inline double bilinear_interpolation(double* image, int rows, int cols, - double r, double c, char mode, - double cval) +cdef double bilinear_interpolation(double* image, int rows, int cols, + double r, double c, char mode, + double cval) -cdef inline double quadratic_interpolation(double x, double[3] f) -cdef inline double biquadratic_interpolation(double* image, int rows, int cols, - double r, double c, char mode, - double cval) +cdef double quadratic_interpolation(double x, double[3] f) +cdef double biquadratic_interpolation(double* image, int rows, int cols, + double r, double c, char mode, + double cval) -cdef inline double cubic_interpolation(double x, double[4] f) -cdef inline double bicubic_interpolation(double* image, int rows, int cols, - double r, double c, char mode, - double cval) +cdef double cubic_interpolation(double x, double[4] f) +cdef double bicubic_interpolation(double* image, int rows, int cols, + double r, double c, char mode, + double cval) -cdef inline double get_pixel(double* image, int rows, int cols, int r, int c, - char mode, double cval) +cdef double get_pixel(double* image, int rows, int cols, int r, int c, + char mode, double cval) -cdef inline int coord_map(int dim, int coord, char mode) +cdef int coord_map(int dim, int coord, char mode) From 2695015b3a98e8ed931a8a5a029c6cef4d9a62a9 Mon Sep 17 00:00:00 2001 From: cgohlke Date: Sat, 29 Sep 2012 15:51:17 -0700 Subject: [PATCH 2/2] Fix: 'inline' not permitted on data declarations --- skimage/_shared/geometry.pxd | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/skimage/_shared/geometry.pxd b/skimage/_shared/geometry.pxd index b228b23a..afdc6b5b 100644 --- a/skimage/_shared/geometry.pxd +++ b/skimage/_shared/geometry.pxd @@ -1,6 +1,5 @@ - -cdef inline unsigned char point_in_polygon(int nr_verts, double *xp, double *yp, - double x, double y) +cdef unsigned char point_in_polygon(int nr_verts, double *xp, double *yp, + double x, double y) cdef void points_in_polygon(int nr_verts, double *xp, double *yp, int nr_points, double *x, double *y,