From e350db23a2c91c008f2193193fd43d5a4a2cfc75 Mon Sep 17 00:00:00 2001
From: Tony S Yu <tsyu80@gmail.com>
Date: Sat, 25 Aug 2012 14:04:48 -0400
Subject: [PATCH] Change reconstruction to support Cython 0.15.

This removes use of Cython's typed memoryviews.

This reverts commit b5d91069664b4f323df9b2a201966a4e8ac8160d: "ENH: Use Cython data types instead of Numpy dtypes."

Conflicts:

	skimage/morphology/_greyreconstruct.pyx
---
 DEPENDS.txt                             |  2 +-
 skimage/morphology/_greyreconstruct.pyx | 29 ++++++++++++++++++-------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/DEPENDS.txt b/DEPENDS.txt
index 7793abdb..b2858256 100644
--- a/DEPENDS.txt
+++ b/DEPENDS.txt
@@ -2,7 +2,7 @@ Build Requirements
 ------------------
 * `Python >= 2.5 <http://python.org>`__
 * `Numpy >= 1.6 <http://numpy.scipy.org/>`__
-* `Cython >= 0.16 <http://www.cython.org/>`__
+* `Cython >= 0.15 <http://www.cython.org/>`__
 
 `Matplotlib >= 1.0 <http://matplotlib.sf.net>`__ is needed to generate the
 examples in the documentation.
diff --git a/skimage/morphology/_greyreconstruct.pyx b/skimage/morphology/_greyreconstruct.pyx
index 5d2cb0c5..e8a84f3b 100644
--- a/skimage/morphology/_greyreconstruct.pyx
+++ b/skimage/morphology/_greyreconstruct.pyx
@@ -8,12 +8,21 @@ All rights reserved.
 Original author: Lee Kamentsky
 
 """
+cimport numpy as cnp
 cimport cython
 
 
 @cython.boundscheck(False)
-def reconstruction_loop(unsigned int[:] ranks, int[:] prev, int[:] next,
-                        int[:] strides, int current_idx, int image_stride):
+def reconstruction_loop(cnp.ndarray[dtype=cnp.uint32_t, ndim=1,
+                                    negative_indices=False, mode='c'] aranks,
+                        cnp.ndarray[dtype=cnp.int32_t, ndim=1,
+                                    negative_indices=False, mode='c'] aprev,
+                        cnp.ndarray[dtype=cnp.int32_t, ndim=1,
+                                    negative_indices=False, mode='c'] anext,
+                        cnp.ndarray[dtype=cnp.int32_t, ndim=1,
+                                    negative_indices=False, mode='c'] astrides,
+                        int current_idx,
+                        int image_stride):
     """The inner loop for reconstruction.
 
     This algorithm uses the rank-order of pixels. If low intensity pixels have
@@ -28,20 +37,24 @@ def reconstruction_loop(unsigned int[:] ranks, int[:] prev, int[:] next,
 
     Parameters
     ----------
-    ranks : array
+    aranks : array
         The rank order of the flattened seed and mask images.
-    prev, next: arrays
+    aprev, anext: arrays
         Indices of previous and next pixels in rank sorted order.
-    strides : array
+    astrides : array
         Strides to neighbors of the current pixel.
     current_idx : int
         Index of highest-ranked pixel used as starting point in loop.
     image_stride : int
-        Stride between seed image and mask image in `ranks`.
+        Stride between seed image and mask image in `aranks`.
     """
     cdef unsigned int neighbor_rank, current_rank, mask_rank
-    cdef int i, current_link, neighbor_idx, nprev, nnext
-    cdef int nstrides = strides.shape[0]
+    cdef int i, neighbor_idx, current_link, nprev, nnext
+    cdef int nstrides = astrides.shape[0]
+    cdef cnp.uint32_t *ranks = <cnp.uint32_t *>(aranks.data)
+    cdef cnp.int32_t *prev = <cnp.int32_t *>(aprev.data)
+    cdef cnp.int32_t *next = <cnp.int32_t *>(anext.data)
+    cdef cnp.int32_t *strides = <cnp.int32_t *>(astrides.data)
 
     while current_idx != -1:
         if current_idx < image_stride: