From 53472b8e075e786c586b9c537453cf3992396e2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Thu, 16 Aug 2012 19:20:48 +0200 Subject: [PATCH] Rename matrix transform function and remove from pxd --- skimage/transform/_project.pxd | 5 ----- skimage/transform/_project.pyx | 5 +++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/skimage/transform/_project.pxd b/skimage/transform/_project.pxd index 36a32d2d..dee51026 100644 --- a/skimage/transform/_project.pxd +++ b/skimage/transform/_project.pxd @@ -5,8 +5,3 @@ import numpy as np cdef inline double bilinear_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 inline int coord_map(int dim, int coord, char mode) \ No newline at end of file diff --git a/skimage/transform/_project.pyx b/skimage/transform/_project.pyx index 245f63cf..3f31f229 100644 --- a/skimage/transform/_project.pyx +++ b/skimage/transform/_project.pyx @@ -108,7 +108,8 @@ cdef inline int coord_map(int dim, int coord, char mode): return coord -cdef inline tf(double x, double y, double* H, double *x_, double *y_): +cdef inline _matrix_transform(double x, double y, double* H, double *x_, + double *y_): """Apply a homography to a coordinate. Parameters @@ -205,7 +206,7 @@ def homography(np.ndarray image, np.ndarray H, output_shape=None, for tfr in range(out_r): for tfc in range(out_c): - tf(tfc, tfr, M.data, &c, &r) + _matrix_transform(tfc, tfr, M.data, &c, &r) out[tfr, tfc] = bilinear_interpolation(img.data, rows, cols, r, c, mode_c)