wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-13 10:19:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

added explicit cython list type and changed creation of contiguous arrays

Browse Source
This commit is contained in:
Johannes Schönberger
2012-04-23 22:06:26 +02:00
parent af345f1a32
commit 9fdfdc9708
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/draw/_draw.pyx
+6 -14
View File
@@ -107,23 +107,15 @@ def polygon(y, x, shape=None):
cdef int r, c
#: make contigous arrays for r, c coordinates
y = y.astype('double')
x = x.astype('double')
cdef np.ndarray contiguous_rdata, contiguous_cdata
if not y.flags['C_CONTIGUOUS']:
contiguous_rdata = y.copy(order='C')
else:
contiguous_rdata = y
if not y.flags['C_CONTIGUOUS']:
contiguous_cdata = x.copy(order='C')
else:
contiguous_cdata = x
contiguous_rdata = np.ascontiguousarray(y, 'double')
contiguous_cdata = np.ascontiguousarray(x, 'double')
cdef np.double_t* rptr = <np.double_t*>contiguous_rdata.data
cdef np.double_t* cptr = <np.double_t*>contiguous_cdata.data
#: output coordinate arrays
rr = list()
cc = list()
cdef list rr = list()
cdef list cc = list()
for r in range(minr, maxr+1):
for c in range(minc, maxc+1):
@@ -167,8 +159,8 @@ def ellipse(double cy, double cx, double b, double a, shape=None):
cdef int r, c
#: output coordinate arrays
rr = list()
cc = list()
cdef list rr = list()
cdef list cc = list()
for r in range(minr, maxr+1):
for c in range(minc, maxc+1):