From 9d9a7492bf76ef6fd6b67136fd7d3169587d36f9 Mon Sep 17 00:00:00 2001 From: Olivier Debeir Date: Fri, 12 Oct 2012 17:03:03 +0200 Subject: [PATCH] remove ascontiguousarray(eimage) --- skimage/rank/_core16.pxd | 1 - skimage/rank/_core16b.pxd | 1 - skimage/rank/_core16p.pxd | 1 - skimage/rank/_core8.pxd | 1 - skimage/rank/_core8p.pxd | 1 - 5 files changed, 5 deletions(-) diff --git a/skimage/rank/_core16.pxd b/skimage/rank/_core16.pxd index 26a8e948..9ead95e0 100644 --- a/skimage/rank/_core16.pxd +++ b/skimage/rank/_core16.pxd @@ -75,7 +75,6 @@ char shift_x, char shift_y,int bitdepth): eimage[centre_r:rows+centre_r,centre_c:cols+centre_c] = image emask[centre_r:rows+centre_r,centre_c:cols+centre_c] = mask - eimage = np.ascontiguousarray(eimage) mask = np.ascontiguousarray(mask) # define pointers to the data diff --git a/skimage/rank/_core16b.pxd b/skimage/rank/_core16b.pxd index cf3cb4c4..d75611a7 100644 --- a/skimage/rank/_core16b.pxd +++ b/skimage/rank/_core16b.pxd @@ -76,7 +76,6 @@ char shift_x, char shift_y,int bitdepth, int s0, int s1): eimage[centre_r:rows+centre_r,centre_c:cols+centre_c] = image emask[centre_r:rows+centre_r,centre_c:cols+centre_c] = mask - eimage = np.ascontiguousarray(eimage) mask = np.ascontiguousarray(mask) # define pointers to the data diff --git a/skimage/rank/_core16p.pxd b/skimage/rank/_core16p.pxd index 1ce9b4cd..9f3a99af 100644 --- a/skimage/rank/_core16p.pxd +++ b/skimage/rank/_core16p.pxd @@ -72,7 +72,6 @@ char shift_x, char shift_y,int bitdepth, float p0, float p1): eimage[centre_r:rows+centre_r,centre_c:cols+centre_c] = image emask[centre_r:rows+centre_r,centre_c:cols+centre_c] = mask - eimage = np.ascontiguousarray(eimage) mask = np.ascontiguousarray(mask) # define pointers to the data diff --git a/skimage/rank/_core8.pxd b/skimage/rank/_core8.pxd index 4ea92121..d9fbee0f 100644 --- a/skimage/rank/_core8.pxd +++ b/skimage/rank/_core8.pxd @@ -65,7 +65,6 @@ char shift_x, char shift_y): eimage[centre_r:rows+centre_r,centre_c:cols+centre_c] = image emask[centre_r:rows+centre_r,centre_c:cols+centre_c] = mask - eimage = np.ascontiguousarray(eimage) mask = np.ascontiguousarray(mask) # define pointers to the data diff --git a/skimage/rank/_core8p.pxd b/skimage/rank/_core8p.pxd index 9b4fbd29..75ceaf89 100644 --- a/skimage/rank/_core8p.pxd +++ b/skimage/rank/_core8p.pxd @@ -62,7 +62,6 @@ char shift_x, char shift_y, float p0, float p1): eimage[centre_r:rows+centre_r,centre_c:cols+centre_c] = image emask[centre_r:rows+centre_r,centre_c:cols+centre_c] = mask - eimage = np.ascontiguousarray(eimage) mask = np.ascontiguousarray(mask) # define pointers to the data