From 9644ed56551b12a67e7ac53cc1617337ba4e328b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jostein=20B=C3=B8=20Fl=C3=B8ystad?= Date: Thu, 11 Jul 2013 13:06:43 +0200 Subject: [PATCH] unwrap: rename variables in cython extensions --- skimage/exposure/_unwrap_2d.pyx | 10 +++++----- skimage/exposure/_unwrap_3d.pyx | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/skimage/exposure/_unwrap_2d.pyx b/skimage/exposure/_unwrap_2d.pyx index 4727404c..88983287 100644 --- a/skimage/exposure/_unwrap_2d.pyx +++ b/skimage/exposure/_unwrap_2d.pyx @@ -4,13 +4,13 @@ cdef extern void unwrap2D(float* wrapped_image, int image_width, int image_height, int wrap_around_x, int wrap_around_y) -def unwrap_2d(float[:, ::1] array, +def unwrap_2d(float[:, ::1] image, unsigned char[:, ::1] mask, - float[:, ::1] unwrapped_array, + float[:, ::1] unwrapped_image, wrap_around): - unwrap2D(&array[0, 0], - &unwrapped_array[0, 0], + unwrap2D(&image[0, 0], + &unwrapped_image[0, 0], &mask[0, 0], - array.shape[1], array.shape[0], + image.shape[1], image.shape[0], wrap_around[1], wrap_around[0], ) diff --git a/skimage/exposure/_unwrap_3d.pyx b/skimage/exposure/_unwrap_3d.pyx index f7a4f10e..b202e8b9 100644 --- a/skimage/exposure/_unwrap_3d.pyx +++ b/skimage/exposure/_unwrap_3d.pyx @@ -4,13 +4,13 @@ cdef extern void unwrap3D(float* wrapped_volume, int image_width, int image_height, int volume_depth, int wrap_around_x, int wrap_around_y, int wrap_around_z) -def unwrap_3d(float[:, :, ::1] array, +def unwrap_3d(float[:, :, ::1] image, unsigned char[:, :, ::1] mask, - float[:, :, ::1] unwrapped_array, + float[:, :, ::1] unwrapped_image, wrap_around): - unwrap3D(&array[0, 0, 0], - &unwrapped_array[0, 0, 0], + unwrap3D(&image[0, 0, 0], + &unwrapped_image[0, 0, 0], &mask[0, 0, 0], - array.shape[2], array.shape[1], array.shape[0], #TODO: check!!! + image.shape[2], image.shape[1], image.shape[0], #TODO: check!!! wrap_around[2], wrap_around[1], wrap_around[0], )