BUG: qhull: allow propagating exceptions out of _get_delaunay_info

djv · Jun 4, 2012 · 24ad9d0 · 24ad9d0
1 parent 07b0a87
commit 24ad9d0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/scipy/spatial/qhull.pxd b/scipy/spatial/qhull.pxd
@@ -28,9 +28,9 @@ ctypedef struct DelaunayInfo_t:
     double *max_bound
     double *min_bound
 
-cdef void _get_delaunay_info(DelaunayInfo_t *, obj,
-                             int compute_transform,
-                             int compute_vertex_to_simplex)
+cdef int _get_delaunay_info(DelaunayInfo_t *, obj,
+                            int compute_transform,
+                            int compute_vertex_to_simplex) except -1
 
 #
 # N-D geometry

diff --git a/scipy/spatial/qhull.pyx b/scipy/spatial/qhull.pyx
@@ -1261,10 +1261,10 @@ def tsearch(tri, xi):
 # Delaunay triangulation interface, for low-level C
 #------------------------------------------------------------------------------
 
-cdef void _get_delaunay_info(DelaunayInfo_t *info,
-                             obj,
-                             int compute_transform,
-                             int compute_vertex_to_simplex):
+cdef int _get_delaunay_info(DelaunayInfo_t *info,
+                            obj,
+                            int compute_transform,
+                            int compute_vertex_to_simplex) except -1:
     cdef np.ndarray[np.double_t, ndim=3] transform
     cdef np.ndarray[np.npy_int, ndim=1] vertex_to_simplex
     cdef np.ndarray[np.double_t, ndim=2] points = obj.points
@@ -1295,3 +1295,5 @@ cdef void _get_delaunay_info(DelaunayInfo_t *info,
         info.vertex_to_simplex = NULL
     info.min_bound = <double*>min_bound.data
     info.max_bound = <double*>max_bound.data
+
+    return 0