unwrap: rename variables in cython extensions

This commit is contained in:
Jostein Bø Fløystad
2013-07-11 13:06:43 +02:00
parent 5022cfb699
commit 9644ed5655
2 changed files with 10 additions and 10 deletions
+5 -5
View File
@@ -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],
)
+5 -5
View File
@@ -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],
)