Merge pull request #330 from cgohlke/patch-5

BUG: Fix: 'inline' not permitted on data declarations.
This commit is contained in:
Stefan van der Walt
2012-09-29 18:03:43 -07:00
2 changed files with 20 additions and 21 deletions
+2 -3
View File
@@ -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,
+18 -18
View File
@@ -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)