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

Use numpy dtype objects instead of strings

Browse Source
This commit is contained in:
Johannes Schönberger
2012-08-20 19:12:00 +02:00
parent 37f5ab47a6
commit 36b22d7819
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/feature/_texture.pyx
+7 -7
View File
@@ -82,19 +82,19 @@ cdef inline int _bit_rotate_right(int value, int length):
def _local_binary_pattern(np.ndarray[double, ndim=2] image,
int P, float R, int method=0):
# texture weights
cdef np.ndarray[int, ndim=1] weights = 2 ** np.arange(P, dtype='int32')
cdef np.ndarray[int, ndim=1] weights = 2 ** np.arange(P, dtype=np.int32)
# local position of texture elements
rp = - R * np.sin(2 * np.pi * np.arange(P, dtype='double') / P)
cp = R * np.cos(2 * np.pi * np.arange(P, dtype='double') / P)
rp = - R * np.sin(2 * np.pi * np.arange(P, dtype=np.double) / P)
cp = R * np.cos(2 * np.pi * np.arange(P, dtype=np.double) / P)
cdef np.ndarray[double, ndim=2] coords = np.round(np.vstack([rp, cp]).T, 5)
# pre allocate arrays for computation
cdef np.ndarray[double, ndim=1] texture = np.zeros(P, 'double')
cdef np.ndarray[char, ndim=1] signed_texture = np.zeros(P, 'int8')
cdef np.ndarray[int, ndim=1] rotation_chain = np.zeros(P, 'int32')
cdef np.ndarray[double, ndim=1] texture = np.zeros(P, np.double)
cdef np.ndarray[char, ndim=1] signed_texture = np.zeros(P, np.int8)
cdef np.ndarray[int, ndim=1] rotation_chain = np.zeros(P, np.int32)
output_shape = (image.shape[0], image.shape[1])
cdef np.ndarray[double, ndim=2] output = np.zeros(output_shape, 'double')
cdef np.ndarray[double, ndim=2] output = np.zeros(output_shape, np.double)
cdef int rows = image.shape[0]
cdef int cols = image.shape[1]