From 9bc93b31546078e554804afbf53fa8516a4437a9 Mon Sep 17 00:00:00 2001 From: sccolbert Date: Fri, 16 Oct 2009 15:41:51 +0200 Subject: [PATCH] Added cvFind and DrawChessboardCorners - from Holger --- scikits/image/opencv/opencv_backend.c | 472 +-- scikits/image/opencv/opencv_constants.py | 2 +- scikits/image/opencv/opencv_cv.c | 3166 +++++++++--------- scikits/image/opencv/opencv_cv.pyx | 227 +- scikits/image/opencv/tests/test_opencv_cv.py | 28 +- setup.py | 1 + 6 files changed, 2020 insertions(+), 1876 deletions(-) diff --git a/scikits/image/opencv/opencv_backend.c b/scikits/image/opencv/opencv_backend.c index e3cd2edd..c6310c04 100644 --- a/scikits/image/opencv/opencv_backend.c +++ b/scikits/image/opencv/opencv_backend.c @@ -1,4 +1,4 @@ -/* Generated by Cython 0.11.3 on Thu Oct 15 13:24:59 2009 */ +/* Generated by Cython 0.11.3 on Fri Oct 16 01:13:46 2009 */ #define PY_SSIZE_T_CLEAN #include "Python.h" @@ -624,7 +624,7 @@ typedef npy_clongdouble __pyx_t_5numpy_clongdouble_t; typedef npy_cdouble __pyx_t_5numpy_complex_t; -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_type.pxd":5 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_type.pxd":5 * # available at build time. * * cdef struct _IplImage: # <<<<<<<<<<<<<< @@ -659,7 +659,7 @@ struct __pyx_t_7scikits_5image_6opencv_11opencv_type__IplImage { typedef struct __pyx_t_7scikits_5image_6opencv_11opencv_type__IplImage __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage; -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_type.pxd":38 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_type.pxd":38 * ctypedef _IplImage IplImage * * cdef struct CvPoint2D32f: # <<<<<<<<<<<<<< @@ -672,7 +672,7 @@ struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f { float y; }; -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_type.pxd":42 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_type.pxd":42 * float y * * cdef struct CvSize: # <<<<<<<<<<<<<< @@ -685,7 +685,7 @@ struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvSize { int height; }; -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_type.pxd":46 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_type.pxd":46 * int height * * cdef struct CvTermCriteria: # <<<<<<<<<<<<<< @@ -931,7 +931,7 @@ static char __pyx_k_28[] = "Non-native byte order not supported"; static char __pyx_k_29[] = "Format string allocated too short."; static char __pyx_k_30[] = "unknown dtype code in numpy.pxd (%d)"; -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":46 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":46 * cdef int IPLIMAGE_SIZE = sizeof(IplImage) * * cdef void populate_iplimage(np.ndarray arr, IplImage* img): # <<<<<<<<<<<<<< @@ -950,7 +950,7 @@ static void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage( int __pyx_t_3; __Pyx_SetupRefcountContext("populate_iplimage"); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":53 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":53 * * # everything that will never change * img.nSize = IPLIMAGE_SIZE # <<<<<<<<<<<<<< @@ -959,7 +959,7 @@ static void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage( */ __pyx_v_img->nSize = __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPLIMAGE_SIZE; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":54 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":54 * # everything that will never change * img.nSize = IPLIMAGE_SIZE * img.ID = 0 # <<<<<<<<<<<<<< @@ -968,7 +968,7 @@ static void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage( */ __pyx_v_img->ID = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":55 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":55 * img.nSize = IPLIMAGE_SIZE * img.ID = 0 * img.dataOrder = 0 # <<<<<<<<<<<<<< @@ -977,7 +977,7 @@ static void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage( */ __pyx_v_img->dataOrder = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":56 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":56 * img.ID = 0 * img.dataOrder = 0 * img.origin = 0 # <<<<<<<<<<<<<< @@ -986,7 +986,7 @@ static void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage( */ __pyx_v_img->origin = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":57 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":57 * img.dataOrder = 0 * img.origin = 0 * img.roi = NULL # <<<<<<<<<<<<<< @@ -995,7 +995,7 @@ static void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage( */ __pyx_v_img->roi = NULL; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":58 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":58 * img.origin = 0 * img.roi = NULL * img.maskROI = NULL # <<<<<<<<<<<<<< @@ -1004,7 +1004,7 @@ static void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage( */ __pyx_v_img->maskROI = NULL; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":59 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":59 * img.roi = NULL * img.maskROI = NULL * img.imageId = NULL # <<<<<<<<<<<<<< @@ -1013,7 +1013,7 @@ static void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage( */ __pyx_v_img->imageId = NULL; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":60 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":60 * img.maskROI = NULL * img.imageId = NULL * img.tileInfo = NULL # <<<<<<<<<<<<<< @@ -1022,7 +1022,7 @@ static void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage( */ __pyx_v_img->tileInfo = NULL; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":63 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":63 * * cdef int channels * cdef int ndim = arr.ndim # <<<<<<<<<<<<<< @@ -1031,7 +1031,7 @@ static void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage( */ __pyx_v_ndim = __pyx_v_arr->nd; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":64 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":64 * cdef int channels * cdef int ndim = arr.ndim * cdef np.npy_intp* shape = arr.shape # <<<<<<<<<<<<<< @@ -1040,7 +1040,7 @@ static void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage( */ __pyx_v_shape = __pyx_v_arr->dimensions; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":65 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":65 * cdef int ndim = arr.ndim * cdef np.npy_intp* shape = arr.shape * cdef np.npy_intp* strides = arr.strides # <<<<<<<<<<<<<< @@ -1049,7 +1049,7 @@ static void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage( */ __pyx_v_strides = __pyx_v_arr->strides; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":69 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":69 * # nChannels is essentially the value of np.shape[2] of a 3D numpy array * # for a 2D array, nChannels is 1 * if ndim == 2: # <<<<<<<<<<<<<< @@ -1059,7 +1059,7 @@ static void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage( __pyx_t_1 = (__pyx_v_ndim == 2); if (__pyx_t_1) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":70 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":70 * # for a 2D array, nChannels is 1 * if ndim == 2: * img.nChannels = 1 # <<<<<<<<<<<<<< @@ -1071,7 +1071,7 @@ static void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage( } /*else*/ { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":72 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":72 * img.nChannels = 1 * else: * img.nChannels = shape[2] # <<<<<<<<<<<<<< @@ -1082,7 +1082,7 @@ static void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage( } __pyx_L3:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":74 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":74 * img.nChannels = shape[2] * * img.depth = _ipltypes[arr.dtype] # <<<<<<<<<<<<<< @@ -1101,7 +1101,7 @@ static void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage( __Pyx_DECREF(__pyx_2); __pyx_2 = 0; __pyx_v_img->depth = __pyx_t_3; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":75 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":75 * * img.depth = _ipltypes[arr.dtype] * img.width = shape[1] # <<<<<<<<<<<<<< @@ -1110,7 +1110,7 @@ static void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage( */ __pyx_v_img->width = (__pyx_v_shape[1]); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":76 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":76 * img.depth = _ipltypes[arr.dtype] * img.width = shape[1] * img.height = shape[0] # <<<<<<<<<<<<<< @@ -1119,7 +1119,7 @@ static void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage( */ __pyx_v_img->height = (__pyx_v_shape[0]); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":77 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":77 * img.width = shape[1] * img.height = shape[0] * img.imageSize = arr.nbytes # <<<<<<<<<<<<<< @@ -1132,7 +1132,7 @@ static void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage( __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_img->imageSize = __pyx_t_3; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":78 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":78 * img.height = shape[0] * img.imageSize = arr.nbytes * img.imageData = arr.data # <<<<<<<<<<<<<< @@ -1141,7 +1141,7 @@ static void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage( */ __pyx_v_img->imageData = ((char *)__pyx_v_arr->data); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":79 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":79 * img.imageSize = arr.nbytes * img.imageData = arr.data * img.widthStep = strides[0] # <<<<<<<<<<<<<< @@ -1150,7 +1150,7 @@ static void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage( */ __pyx_v_img->widthStep = (__pyx_v_strides[0]); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":84 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":84 * # deallocate images, but it will never attempt to deallocate images we * # create ourselves. * img.imageDataOrigin = NULL # <<<<<<<<<<<<<< @@ -1169,7 +1169,7 @@ static void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage( __Pyx_FinishRefcountContext(); } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":86 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":86 * img.imageDataOrigin = NULL * * cdef int validate_array(np.ndarray arr) except -1: # <<<<<<<<<<<<<< @@ -1185,7 +1185,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(PyAr PyObject *__pyx_t_3 = NULL; __Pyx_SetupRefcountContext("validate_array"); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":87 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":87 * * cdef int validate_array(np.ndarray arr) except -1: * if arr.ndim != 2 and arr.ndim != 3: # <<<<<<<<<<<<<< @@ -1199,7 +1199,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(PyAr } if (__pyx_t_1) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":88 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":88 * cdef int validate_array(np.ndarray arr) except -1: * if arr.ndim != 2 and arr.ndim != 3: * raise ValueError('Arrays must have either 2 or 3 dimensions') # <<<<<<<<<<<<<< @@ -1221,7 +1221,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(PyAr } __pyx_L3:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":89 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":89 * if arr.ndim != 2 and arr.ndim != 3: * raise ValueError('Arrays must have either 2 or 3 dimensions') * if arr.ndim == 3: # <<<<<<<<<<<<<< @@ -1231,7 +1231,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(PyAr __pyx_t_1 = (__pyx_v_arr->nd == 3); if (__pyx_t_1) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":90 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":90 * raise ValueError('Arrays must have either 2 or 3 dimensions') * if arr.ndim == 3: * if arr.shape[2] > 4: # <<<<<<<<<<<<<< @@ -1241,7 +1241,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(PyAr __pyx_t_1 = ((__pyx_v_arr->dimensions[2]) > 4); if (__pyx_t_1) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":91 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":91 * if arr.ndim == 3: * if arr.shape[2] > 4: * raise ValueError('A 3D array must have 4 or less channels') # <<<<<<<<<<<<<< @@ -1266,7 +1266,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(PyAr } __pyx_L4:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":92 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":92 * if arr.shape[2] > 4: * raise ValueError('A 3D array must have 4 or less channels') * if arr.dtype not in _ipltypes: # <<<<<<<<<<<<<< @@ -1282,7 +1282,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(PyAr __Pyx_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_t_1) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":93 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":93 * raise ValueError('A 3D array must have 4 or less channels') * if arr.dtype not in _ipltypes: * raise ValueError('Arrays must have one of the following dtypes: ' # <<<<<<<<<<<<<< @@ -1304,7 +1304,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(PyAr } __pyx_L6:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":95 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":95 * raise ValueError('Arrays must have one of the following dtypes: ' * 'uint8, int8, int16, int32, float32, float64') * return 1 # <<<<<<<<<<<<<< @@ -1327,7 +1327,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(PyAr return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":97 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":97 * return 1 * * cdef int assert_dtype(np.ndarray arr, dtypes) except -1: # <<<<<<<<<<<<<< @@ -1342,7 +1342,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(PyArra PyObject *__pyx_t_3 = NULL; __Pyx_SetupRefcountContext("assert_dtype"); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":98 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":98 * * cdef int assert_dtype(np.ndarray arr, dtypes) except -1: * if arr.dtype not in dtypes: # <<<<<<<<<<<<<< @@ -1355,7 +1355,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(PyArra __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; if (__pyx_t_2) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":100 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":100 * if arr.dtype not in dtypes: * raise ValueError('Unsupported dtype for this operation. \ * Supported dtypes are %s' % str(dtypes)) # <<<<<<<<<<<<<< @@ -1388,7 +1388,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(PyArra } __pyx_L3:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":101 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":101 * raise ValueError('Unsupported dtype for this operation. \ * Supported dtypes are %s' % str(dtypes)) * return 1 # <<<<<<<<<<<<<< @@ -1410,7 +1410,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(PyArra return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":103 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":103 * return 1 * * cdef int assert_ndims(np.ndarray arr, dims) except -1: # <<<<<<<<<<<<<< @@ -1425,7 +1425,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(PyArra PyObject *__pyx_t_3 = NULL; __Pyx_SetupRefcountContext("assert_ndims"); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":104 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":104 * * cdef int assert_ndims(np.ndarray arr, dims) except -1: * if arr.ndim not in dims: # <<<<<<<<<<<<<< @@ -1438,7 +1438,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(PyArra __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; if (__pyx_t_2) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":105 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":105 * cdef int assert_ndims(np.ndarray arr, dims) except -1: * if arr.ndim not in dims: * raise ValueError('Incorrect number of dimensions') # <<<<<<<<<<<<<< @@ -1460,7 +1460,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(PyArra } __pyx_L3:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":106 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":106 * if arr.ndim not in dims: * raise ValueError('Incorrect number of dimensions') * return 1 # <<<<<<<<<<<<<< @@ -1482,7 +1482,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(PyArra return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":108 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":108 * return 1 * * cdef int assert_nchannels(np.ndarray arr, channels) except -1: # <<<<<<<<<<<<<< @@ -1498,7 +1498,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(Py PyObject *__pyx_t_3 = NULL; __Pyx_SetupRefcountContext("assert_nchannels"); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":110 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":110 * cdef int assert_nchannels(np.ndarray arr, channels) except -1: * cdef int nchannels * if arr.ndim == 2: # <<<<<<<<<<<<<< @@ -1508,7 +1508,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(Py __pyx_t_1 = (__pyx_v_arr->nd == 2); if (__pyx_t_1) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":111 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":111 * cdef int nchannels * if arr.ndim == 2: * nchannels = 1 # <<<<<<<<<<<<<< @@ -1520,7 +1520,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(Py } /*else*/ { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":113 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":113 * nchannels = 1 * else: * nchannels = arr.shape[2] # <<<<<<<<<<<<<< @@ -1531,7 +1531,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(Py } __pyx_L3:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":114 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":114 * else: * nchannels = arr.shape[2] * if nchannels not in channels: # <<<<<<<<<<<<<< @@ -1544,7 +1544,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(Py __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; if (__pyx_t_1) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":115 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":115 * nchannels = arr.shape[2] * if nchannels not in channels: * raise ValueError('Incorrect number of channels') # <<<<<<<<<<<<<< @@ -1566,7 +1566,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(Py } __pyx_L4:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":116 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":116 * if nchannels not in channels: * raise ValueError('Incorrect number of channels') * return 1 # <<<<<<<<<<<<<< @@ -1588,7 +1588,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(Py return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":118 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":118 * return 1 * * cdef int assert_same_dtype(np.ndarray arr1, np.ndarray arr2) except -1: # <<<<<<<<<<<<<< @@ -1604,7 +1604,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_dtype(P int __pyx_t_4; __Pyx_SetupRefcountContext("assert_same_dtype"); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":119 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":119 * * cdef int assert_same_dtype(np.ndarray arr1, np.ndarray arr2) except -1: * if arr1.dtype != arr2.dtype: # <<<<<<<<<<<<<< @@ -1623,7 +1623,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_dtype(P __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; if (__pyx_t_4) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":120 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":120 * cdef int assert_same_dtype(np.ndarray arr1, np.ndarray arr2) except -1: * if arr1.dtype != arr2.dtype: * raise ValueError('dtypes not same') # <<<<<<<<<<<<<< @@ -1645,7 +1645,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_dtype(P } __pyx_L3:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":121 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":121 * if arr1.dtype != arr2.dtype: * raise ValueError('dtypes not same') * return 1 # <<<<<<<<<<<<<< @@ -1668,7 +1668,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_dtype(P return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":123 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":123 * return 1 * * cdef int assert_same_shape(np.ndarray arr1, np.ndarray arr2) except -1: # <<<<<<<<<<<<<< @@ -1683,7 +1683,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(P PyObject *__pyx_t_3 = NULL; __Pyx_SetupRefcountContext("assert_same_shape"); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":124 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":124 * * cdef int assert_same_shape(np.ndarray arr1, np.ndarray arr2) except -1: * if not np.PyArray_SAMESHAPE(arr1, arr2): # <<<<<<<<<<<<<< @@ -1693,7 +1693,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(P __pyx_t_1 = (!PyArray_SAMESHAPE(__pyx_v_arr1, __pyx_v_arr2)); if (__pyx_t_1) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":125 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":125 * cdef int assert_same_shape(np.ndarray arr1, np.ndarray arr2) except -1: * if not np.PyArray_SAMESHAPE(arr1, arr2): * raise ValueError('arrays not same shape') # <<<<<<<<<<<<<< @@ -1715,7 +1715,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(P } __pyx_L3:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":126 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":126 * if not np.PyArray_SAMESHAPE(arr1, arr2): * raise ValueError('arrays not same shape') * return 1 # <<<<<<<<<<<<<< @@ -1737,7 +1737,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(P return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":128 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":128 * return 1 * * cdef int assert_same_width_and_height(np.ndarray arr1, np.ndarray arr2) \ # <<<<<<<<<<<<<< @@ -1754,7 +1754,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_width_a PyObject *__pyx_t_3 = NULL; __Pyx_SetupRefcountContext("assert_same_width_and_height"); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":130 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":130 * cdef int assert_same_width_and_height(np.ndarray arr1, np.ndarray arr2) \ * except -1: * cdef np.npy_intp* shape1 = arr1.shape # <<<<<<<<<<<<<< @@ -1763,7 +1763,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_width_a */ __pyx_v_shape1 = __pyx_v_arr1->dimensions; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":131 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":131 * except -1: * cdef np.npy_intp* shape1 = arr1.shape * cdef np.npy_intp* shape2 = arr2.shape # <<<<<<<<<<<<<< @@ -1772,7 +1772,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_width_a */ __pyx_v_shape2 = __pyx_v_arr2->dimensions; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":132 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":132 * cdef np.npy_intp* shape1 = arr1.shape * cdef np.npy_intp* shape2 = arr2.shape * if (shape1[0] != shape2[0]) or (shape1[1] != shape2[1]): # <<<<<<<<<<<<<< @@ -1786,7 +1786,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_width_a } if (__pyx_t_1) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":133 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":133 * cdef np.npy_intp* shape2 = arr2.shape * if (shape1[0] != shape2[0]) or (shape1[1] != shape2[1]): * raise ValueError('Arrays must have same width and height') # <<<<<<<<<<<<<< @@ -1808,7 +1808,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_width_a } __pyx_L3:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":134 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":134 * if (shape1[0] != shape2[0]) or (shape1[1] != shape2[1]): * raise ValueError('Arrays must have same width and height') * return 1 # <<<<<<<<<<<<<< @@ -1830,7 +1830,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_width_a return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":136 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":136 * return 1 * * cdef int assert_like(np.ndarray arr1, np.ndarray arr2) except -1: # <<<<<<<<<<<<<< @@ -1843,7 +1843,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_like(PyArray int __pyx_t_1; __Pyx_SetupRefcountContext("assert_like"); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":137 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":137 * * cdef int assert_like(np.ndarray arr1, np.ndarray arr2) except -1: * assert_same_dtype(arr1, arr2) # <<<<<<<<<<<<<< @@ -1852,7 +1852,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_like(PyArray */ __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_dtype(__pyx_v_arr1, __pyx_v_arr2); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":138 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":138 * cdef int assert_like(np.ndarray arr1, np.ndarray arr2) except -1: * assert_same_dtype(arr1, arr2) * assert_same_shape(arr1, arr2) # <<<<<<<<<<<<<< @@ -1861,7 +1861,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_like(PyArray */ __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(__pyx_v_arr1, __pyx_v_arr2); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 138; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":139 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":139 * assert_same_dtype(arr1, arr2) * assert_same_shape(arr1, arr2) * return 1 # <<<<<<<<<<<<<< @@ -1881,7 +1881,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_like(PyArray return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":141 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":141 * return 1 * * cdef int assert_not_sharing_data(np.ndarray arr1, np.ndarray arr2) except -1: # <<<<<<<<<<<<<< @@ -1896,7 +1896,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_ PyObject *__pyx_t_3 = NULL; __Pyx_SetupRefcountContext("assert_not_sharing_data"); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":142 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":142 * * cdef int assert_not_sharing_data(np.ndarray arr1, np.ndarray arr2) except -1: * if arr1.data == arr2.data: # <<<<<<<<<<<<<< @@ -1906,7 +1906,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_ __pyx_t_1 = (__pyx_v_arr1->data == __pyx_v_arr2->data); if (__pyx_t_1) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":143 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":143 * cdef int assert_not_sharing_data(np.ndarray arr1, np.ndarray arr2) except -1: * if arr1.data == arr2.data: * raise ValueError('In place operation not supported. Make sure \ # <<<<<<<<<<<<<< @@ -1928,7 +1928,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_ } __pyx_L3:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":145 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":145 * raise ValueError('In place operation not supported. Make sure \ * the out array is not just a view of src array') * return 1 # <<<<<<<<<<<<<< @@ -1950,7 +1950,7 @@ static int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_ return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":150 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":150 * # NumPy array convienences * #----------------------------------------------------------------------------- * cdef np.ndarray new_array(int ndim, np.npy_intp* shape, dtype): # <<<<<<<<<<<<<< @@ -1963,7 +1963,7 @@ static PyArrayObject *__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_arra PyObject *__pyx_t_1 = NULL; __Pyx_SetupRefcountContext("new_array"); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":152 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":152 * cdef np.ndarray new_array(int ndim, np.npy_intp* shape, dtype): * # need to incref because numpy will apprently steal a dtype reference * Py_INCREF(dtype) # <<<<<<<<<<<<<< @@ -1972,7 +1972,7 @@ static PyArrayObject *__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_arra */ Py_INCREF(__pyx_v_dtype); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":153 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":153 * # need to incref because numpy will apprently steal a dtype reference * Py_INCREF(dtype) * return PyArray_Empty(ndim, shape, dtype, 0) # <<<<<<<<<<<<<< @@ -1999,7 +1999,7 @@ static PyArrayObject *__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_arra return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":155 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":155 * return PyArray_Empty(ndim, shape, dtype, 0) * * cdef np.ndarray new_array_like(np.ndarray arr): # <<<<<<<<<<<<<< @@ -2013,7 +2013,7 @@ static PyArrayObject *__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_arra PyObject *__pyx_t_2 = NULL; __Pyx_SetupRefcountContext("new_array_like"); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":157 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":157 * cdef np.ndarray new_array_like(np.ndarray arr): * # need to incref because numpy will apprently steal a dtype reference * Py_INCREF(arr.dtype) # <<<<<<<<<<<<<< @@ -2025,7 +2025,7 @@ static PyArrayObject *__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_arra Py_INCREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":158 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":158 * # need to incref because numpy will apprently steal a dtype reference * Py_INCREF(arr.dtype) * return PyArray_Empty(arr.ndim, arr.shape, arr.dtype, 0) # <<<<<<<<<<<<<< @@ -2056,7 +2056,7 @@ static PyArrayObject *__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_arra return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":160 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":160 * return PyArray_Empty(arr.ndim, arr.shape, arr.dtype, 0) * * cdef np.ndarray new_array_like_diff_dtype(np.ndarray arr, dtype): # <<<<<<<<<<<<<< @@ -2069,7 +2069,7 @@ static PyArrayObject *__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_arra PyObject *__pyx_t_1 = NULL; __Pyx_SetupRefcountContext("new_array_like_diff_dtype"); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":162 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":162 * cdef np.ndarray new_array_like_diff_dtype(np.ndarray arr, dtype): * # need to incref because numpy will apprently steal a dtype reference * Py_INCREF(dtype) # <<<<<<<<<<<<<< @@ -2078,7 +2078,7 @@ static PyArrayObject *__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_arra */ Py_INCREF(__pyx_v_dtype); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":163 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":163 * # need to incref because numpy will apprently steal a dtype reference * Py_INCREF(dtype) * return PyArray_Empty(arr.ndim, arr.shape, dtype, 0) # <<<<<<<<<<<<<< @@ -2105,7 +2105,7 @@ static PyArrayObject *__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_arra return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":165 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":165 * return PyArray_Empty(arr.ndim, arr.shape, dtype, 0) * * cdef np.npy_intp* clone_array_shape(np.ndarray arr): # <<<<<<<<<<<<<< @@ -2121,7 +2121,7 @@ static npy_intp *__pyx_f_7scikits_5image_6opencv_14opencv_backend_clone_array_s int __pyx_t_1; __Pyx_SetupRefcountContext("clone_array_shape"); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":167 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":167 * cdef np.npy_intp* clone_array_shape(np.ndarray arr): * # make sure you call PyMem_Free after your done with the shape * cdef int ndim = arr.ndim # <<<<<<<<<<<<<< @@ -2130,7 +2130,7 @@ static npy_intp *__pyx_f_7scikits_5image_6opencv_14opencv_backend_clone_array_s */ __pyx_v_ndim = __pyx_v_arr->nd; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":169 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":169 * cdef int ndim = arr.ndim * cdef np.npy_intp* shape = PyMem_Malloc( * ndim * sizeof(np.npy_intp)) # <<<<<<<<<<<<<< @@ -2139,7 +2139,7 @@ static npy_intp *__pyx_f_7scikits_5image_6opencv_14opencv_backend_clone_array_s */ __pyx_v_shape = ((npy_intp *)PyMem_Malloc((__pyx_v_ndim * (sizeof(npy_intp))))); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":171 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":171 * ndim * sizeof(np.npy_intp)) * cdef int i * for i in range(ndim): # <<<<<<<<<<<<<< @@ -2149,7 +2149,7 @@ static npy_intp *__pyx_f_7scikits_5image_6opencv_14opencv_backend_clone_array_s for (__pyx_t_1 = 0; __pyx_t_1 < __pyx_v_ndim; __pyx_t_1+=1) { __pyx_v_i = __pyx_t_1; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":172 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":172 * cdef int i * for i in range(ndim): * shape[i] = arr.shape[i] # <<<<<<<<<<<<<< @@ -2159,7 +2159,7 @@ static npy_intp *__pyx_f_7scikits_5image_6opencv_14opencv_backend_clone_array_s (__pyx_v_shape[__pyx_v_i]) = (__pyx_v_arr->dimensions[__pyx_v_i]); } - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":173 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":173 * for i in range(ndim): * shape[i] = arr.shape[i] * return shape # <<<<<<<<<<<<<< @@ -2175,7 +2175,7 @@ static npy_intp *__pyx_f_7scikits_5image_6opencv_14opencv_backend_clone_array_s return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":175 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":175 * return shape * * cdef np.npy_intp get_array_nbytes(np.ndarray arr): # <<<<<<<<<<<<<< @@ -2188,7 +2188,7 @@ static npy_intp __pyx_f_7scikits_5image_6opencv_14opencv_backend_get_array_nbyt npy_intp __pyx_r; __Pyx_SetupRefcountContext("get_array_nbytes"); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":176 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":176 * * cdef np.npy_intp get_array_nbytes(np.ndarray arr): * cdef np.npy_intp nbytes = np.PyArray_NBYTES(arr) # <<<<<<<<<<<<<< @@ -2197,7 +2197,7 @@ static npy_intp __pyx_f_7scikits_5image_6opencv_14opencv_backend_get_array_nbyt */ __pyx_v_nbytes = PyArray_NBYTES(__pyx_v_arr); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":177 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":177 * cdef np.npy_intp get_array_nbytes(np.ndarray arr): * cdef np.npy_intp nbytes = np.PyArray_NBYTES(arr) * return nbytes # <<<<<<<<<<<<<< @@ -2213,7 +2213,7 @@ static npy_intp __pyx_f_7scikits_5image_6opencv_14opencv_backend_get_array_nbyt return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":182 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":182 * # OpenCV convienences * #----------------------------------------------------------------------------- * cdef CvPoint2D32f* array_as_cvPoint2D32f_ptr(np.ndarray arr): # <<<<<<<<<<<<<< @@ -2226,7 +2226,7 @@ static struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *__pyx struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *__pyx_r; __Pyx_SetupRefcountContext("array_as_cvPoint2D32f_ptr"); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":184 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":184 * cdef CvPoint2D32f* array_as_cvPoint2D32f_ptr(np.ndarray arr): * cdef CvPoint2D32f* point2Darr * point2Darr = arr.data # <<<<<<<<<<<<<< @@ -2235,7 +2235,7 @@ static struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *__pyx */ __pyx_v_point2Darr = ((struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *)__pyx_v_arr->data); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":185 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":185 * cdef CvPoint2D32f* point2Darr * point2Darr = arr.data * return point2Darr # <<<<<<<<<<<<<< @@ -2251,7 +2251,7 @@ static struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *__pyx return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":187 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":187 * return point2Darr * * cdef CvTermCriteria get_cvTermCriteria(int iterations, double epsilon): # <<<<<<<<<<<<<< @@ -2269,7 +2269,7 @@ static struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py int __pyx_t_3; __Pyx_SetupRefcountContext("get_cvTermCriteria"); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":189 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":189 * cdef CvTermCriteria get_cvTermCriteria(int iterations, double epsilon): * cdef CvTermCriteria crit * if iterations and epsilon: # <<<<<<<<<<<<<< @@ -2283,7 +2283,7 @@ static struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py } if (__pyx_t_1) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":190 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":190 * cdef CvTermCriteria crit * if iterations and epsilon: * crit.type = (CV_TERMCRIT_ITER | CV_TERMCRIT_EPS) # <<<<<<<<<<<<<< @@ -2302,7 +2302,7 @@ static struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_crit.type = ((int)__pyx_t_3); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":191 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":191 * if iterations and epsilon: * crit.type = (CV_TERMCRIT_ITER | CV_TERMCRIT_EPS) * crit.max_iter = iterations # <<<<<<<<<<<<<< @@ -2311,7 +2311,7 @@ static struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py */ __pyx_v_crit.max_iter = __pyx_v_iterations; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":192 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":192 * crit.type = (CV_TERMCRIT_ITER | CV_TERMCRIT_EPS) * crit.max_iter = iterations * crit.epsilon = epsilon # <<<<<<<<<<<<<< @@ -2322,7 +2322,7 @@ static struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py goto __pyx_L3; } - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":193 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":193 * crit.max_iter = iterations * crit.epsilon = epsilon * elif iterations and not epsilon: # <<<<<<<<<<<<<< @@ -2336,7 +2336,7 @@ static struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py } if (__pyx_t_1) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":194 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":194 * crit.epsilon = epsilon * elif iterations and not epsilon: * crit.type = CV_TERMCRIT_ITER # <<<<<<<<<<<<<< @@ -2349,7 +2349,7 @@ static struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_v_crit.type = ((int)__pyx_t_3); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":195 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":195 * elif iterations and not epsilon: * crit.type = CV_TERMCRIT_ITER * crit.max_iter = iterations # <<<<<<<<<<<<<< @@ -2358,7 +2358,7 @@ static struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py */ __pyx_v_crit.max_iter = __pyx_v_iterations; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":196 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":196 * crit.type = CV_TERMCRIT_ITER * crit.max_iter = iterations * crit.epsilon = 0. # <<<<<<<<<<<<<< @@ -2370,7 +2370,7 @@ static struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py } /*else*/ { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":198 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":198 * crit.epsilon = 0. * else: * crit.type = CV_TERMCRIT_EPS # <<<<<<<<<<<<<< @@ -2383,7 +2383,7 @@ static struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py __Pyx_DECREF(__pyx_2); __pyx_2 = 0; __pyx_v_crit.type = ((int)__pyx_t_3); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":199 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":199 * else: * crit.type = CV_TERMCRIT_EPS * crit.max_iter = 0 # <<<<<<<<<<<<<< @@ -2392,7 +2392,7 @@ static struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py */ __pyx_v_crit.max_iter = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":200 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":200 * crit.type = CV_TERMCRIT_EPS * crit.max_iter = 0 * crit.epsilon = epsilon # <<<<<<<<<<<<<< @@ -2402,7 +2402,7 @@ static struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py } __pyx_L3:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":201 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":201 * crit.max_iter = 0 * crit.epsilon = epsilon * return crit # <<<<<<<<<<<<<< @@ -2421,7 +2421,7 @@ static struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py return __pyx_r; } -/* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":152 +/* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":152 * # experimental exception made for __getbuffer__ and __releasebuffer__ * # -- the details of this may change. * def __getbuffer__(ndarray self, Py_buffer* info, int flags): # <<<<<<<<<<<<<< @@ -2454,7 +2454,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf __pyx_v_info->obj = Py_None; __Pyx_INCREF(Py_None); __Pyx_GIVEREF(__pyx_v_info->obj); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":158 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":158 * # of flags * cdef int copy_shape, i, ndim * cdef int endian_detector = 1 # <<<<<<<<<<<<<< @@ -2463,7 +2463,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_endian_detector = 1; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":159 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":159 * cdef int copy_shape, i, ndim * cdef int endian_detector = 1 * cdef bint little_endian = ((&endian_detector)[0] != 0) # <<<<<<<<<<<<<< @@ -2472,7 +2472,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_little_endian = ((((char *)(&__pyx_v_endian_detector))[0]) != 0); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":161 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":161 * cdef bint little_endian = ((&endian_detector)[0] != 0) * * ndim = PyArray_NDIM(self) # <<<<<<<<<<<<<< @@ -2481,7 +2481,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_ndim = PyArray_NDIM(((PyArrayObject *)__pyx_v_self)); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":163 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":163 * ndim = PyArray_NDIM(self) * * if sizeof(npy_intp) != sizeof(Py_ssize_t): # <<<<<<<<<<<<<< @@ -2491,7 +2491,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf __pyx_t_1 = ((sizeof(npy_intp)) != (sizeof(Py_ssize_t))); if (__pyx_t_1) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":164 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":164 * * if sizeof(npy_intp) != sizeof(Py_ssize_t): * copy_shape = 1 # <<<<<<<<<<<<<< @@ -2503,7 +2503,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } /*else*/ { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":166 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":166 * copy_shape = 1 * else: * copy_shape = 0 # <<<<<<<<<<<<<< @@ -2514,7 +2514,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } __pyx_L5:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":168 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":168 * copy_shape = 0 * * if ((flags & pybuf.PyBUF_C_CONTIGUOUS == pybuf.PyBUF_C_CONTIGUOUS) # <<<<<<<<<<<<<< @@ -2523,7 +2523,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ if (((__pyx_v_flags & PyBUF_C_CONTIGUOUS) == PyBUF_C_CONTIGUOUS)) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":169 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":169 * * if ((flags & pybuf.PyBUF_C_CONTIGUOUS == pybuf.PyBUF_C_CONTIGUOUS) * and not PyArray_CHKFLAGS(self, NPY_C_CONTIGUOUS)): # <<<<<<<<<<<<<< @@ -2536,7 +2536,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } if (__pyx_t_1) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":170 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":170 * if ((flags & pybuf.PyBUF_C_CONTIGUOUS == pybuf.PyBUF_C_CONTIGUOUS) * and not PyArray_CHKFLAGS(self, NPY_C_CONTIGUOUS)): * raise ValueError("ndarray is not C contiguous") # <<<<<<<<<<<<<< @@ -2558,7 +2558,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } __pyx_L6:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":172 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":172 * raise ValueError("ndarray is not C contiguous") * * if ((flags & pybuf.PyBUF_F_CONTIGUOUS == pybuf.PyBUF_F_CONTIGUOUS) # <<<<<<<<<<<<<< @@ -2567,7 +2567,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ if (((__pyx_v_flags & PyBUF_F_CONTIGUOUS) == PyBUF_F_CONTIGUOUS)) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":173 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":173 * * if ((flags & pybuf.PyBUF_F_CONTIGUOUS == pybuf.PyBUF_F_CONTIGUOUS) * and not PyArray_CHKFLAGS(self, NPY_F_CONTIGUOUS)): # <<<<<<<<<<<<<< @@ -2580,7 +2580,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } if (__pyx_t_1) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":174 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":174 * if ((flags & pybuf.PyBUF_F_CONTIGUOUS == pybuf.PyBUF_F_CONTIGUOUS) * and not PyArray_CHKFLAGS(self, NPY_F_CONTIGUOUS)): * raise ValueError("ndarray is not Fortran contiguous") # <<<<<<<<<<<<<< @@ -2602,7 +2602,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } __pyx_L7:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":176 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":176 * raise ValueError("ndarray is not Fortran contiguous") * * info.buf = PyArray_DATA(self) # <<<<<<<<<<<<<< @@ -2611,7 +2611,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_info->buf = PyArray_DATA(((PyArrayObject *)__pyx_v_self)); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":177 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":177 * * info.buf = PyArray_DATA(self) * info.ndim = ndim # <<<<<<<<<<<<<< @@ -2620,7 +2620,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_info->ndim = __pyx_v_ndim; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":178 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":178 * info.buf = PyArray_DATA(self) * info.ndim = ndim * if copy_shape: # <<<<<<<<<<<<<< @@ -2630,7 +2630,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf __pyx_t_4 = __pyx_v_copy_shape; if (__pyx_t_4) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":181 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":181 * # Allocate new buffer for strides and shape info. This is allocated * # as one block, strides first. * info.strides = stdlib.malloc(sizeof(Py_ssize_t) * ndim * 2) # <<<<<<<<<<<<<< @@ -2639,7 +2639,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_info->strides = ((Py_ssize_t *)malloc((((sizeof(Py_ssize_t)) * __pyx_v_ndim) * 2))); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":182 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":182 * # as one block, strides first. * info.strides = stdlib.malloc(sizeof(Py_ssize_t) * ndim * 2) * info.shape = info.strides + ndim # <<<<<<<<<<<<<< @@ -2648,7 +2648,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_info->shape = (__pyx_v_info->strides + __pyx_v_ndim); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":183 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":183 * info.strides = stdlib.malloc(sizeof(Py_ssize_t) * ndim * 2) * info.shape = info.strides + ndim * for i in range(ndim): # <<<<<<<<<<<<<< @@ -2658,7 +2658,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_v_ndim; __pyx_t_4+=1) { __pyx_v_i = __pyx_t_4; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":184 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":184 * info.shape = info.strides + ndim * for i in range(ndim): * info.strides[i] = PyArray_STRIDES(self)[i] # <<<<<<<<<<<<<< @@ -2667,7 +2667,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ (__pyx_v_info->strides[__pyx_v_i]) = (PyArray_STRIDES(((PyArrayObject *)__pyx_v_self))[__pyx_v_i]); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":185 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":185 * for i in range(ndim): * info.strides[i] = PyArray_STRIDES(self)[i] * info.shape[i] = PyArray_DIMS(self)[i] # <<<<<<<<<<<<<< @@ -2680,7 +2680,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } /*else*/ { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":187 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":187 * info.shape[i] = PyArray_DIMS(self)[i] * else: * info.strides = PyArray_STRIDES(self) # <<<<<<<<<<<<<< @@ -2689,7 +2689,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_info->strides = ((Py_ssize_t *)PyArray_STRIDES(((PyArrayObject *)__pyx_v_self))); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":188 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":188 * else: * info.strides = PyArray_STRIDES(self) * info.shape = PyArray_DIMS(self) # <<<<<<<<<<<<<< @@ -2700,7 +2700,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } __pyx_L8:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":189 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":189 * info.strides = PyArray_STRIDES(self) * info.shape = PyArray_DIMS(self) * info.suboffsets = NULL # <<<<<<<<<<<<<< @@ -2709,7 +2709,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_info->suboffsets = NULL; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":190 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":190 * info.shape = PyArray_DIMS(self) * info.suboffsets = NULL * info.itemsize = PyArray_ITEMSIZE(self) # <<<<<<<<<<<<<< @@ -2718,7 +2718,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_info->itemsize = PyArray_ITEMSIZE(((PyArrayObject *)__pyx_v_self)); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":191 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":191 * info.suboffsets = NULL * info.itemsize = PyArray_ITEMSIZE(self) * info.readonly = not PyArray_ISWRITEABLE(self) # <<<<<<<<<<<<<< @@ -2727,7 +2727,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_info->readonly = (!PyArray_ISWRITEABLE(((PyArrayObject *)__pyx_v_self))); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":194 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":194 * * cdef int t * cdef char* f = NULL # <<<<<<<<<<<<<< @@ -2736,7 +2736,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_f = NULL; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":195 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":195 * cdef int t * cdef char* f = NULL * cdef dtype descr = self.descr # <<<<<<<<<<<<<< @@ -2746,7 +2746,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf __Pyx_INCREF(((PyObject *)((PyArrayObject *)__pyx_v_self)->descr)); __pyx_v_descr = ((PyArrayObject *)__pyx_v_self)->descr; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":199 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":199 * cdef int offset * * cdef bint hasfields = PyDataType_HASFIELDS(descr) # <<<<<<<<<<<<<< @@ -2755,7 +2755,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_hasfields = PyDataType_HASFIELDS(__pyx_v_descr); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":201 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":201 * cdef bint hasfields = PyDataType_HASFIELDS(descr) * * if not hasfields and not copy_shape: # <<<<<<<<<<<<<< @@ -2769,7 +2769,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } if (__pyx_t_1) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":203 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":203 * if not hasfields and not copy_shape: * # do not call releasebuffer * info.obj = None # <<<<<<<<<<<<<< @@ -2785,7 +2785,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } /*else*/ { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":206 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":206 * else: * # need to call releasebuffer * info.obj = self # <<<<<<<<<<<<<< @@ -2800,7 +2800,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } __pyx_L11:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":208 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":208 * info.obj = self * * if not hasfields: # <<<<<<<<<<<<<< @@ -2810,7 +2810,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf __pyx_t_1 = (!__pyx_v_hasfields); if (__pyx_t_1) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":209 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":209 * * if not hasfields: * t = descr.type_num # <<<<<<<<<<<<<< @@ -2819,7 +2819,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_t = __pyx_v_descr->type_num; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":210 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":210 * if not hasfields: * t = descr.type_num * if ((descr.byteorder == '>' and little_endian) or # <<<<<<<<<<<<<< @@ -2833,7 +2833,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } if (!__pyx_t_1) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":211 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":211 * t = descr.type_num * if ((descr.byteorder == '>' and little_endian) or * (descr.byteorder == '<' and not little_endian)): # <<<<<<<<<<<<<< @@ -2851,7 +2851,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } if (__pyx_t_6) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":212 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":212 * if ((descr.byteorder == '>' and little_endian) or * (descr.byteorder == '<' and not little_endian)): * raise ValueError("Non-native byte order not supported") # <<<<<<<<<<<<<< @@ -2873,7 +2873,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } __pyx_L13:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":213 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":213 * (descr.byteorder == '<' and not little_endian)): * raise ValueError("Non-native byte order not supported") * if t == NPY_BYTE: f = "b" # <<<<<<<<<<<<<< @@ -2886,7 +2886,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":214 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":214 * raise ValueError("Non-native byte order not supported") * if t == NPY_BYTE: f = "b" * elif t == NPY_UBYTE: f = "B" # <<<<<<<<<<<<<< @@ -2899,7 +2899,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":215 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":215 * if t == NPY_BYTE: f = "b" * elif t == NPY_UBYTE: f = "B" * elif t == NPY_SHORT: f = "h" # <<<<<<<<<<<<<< @@ -2912,7 +2912,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":216 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":216 * elif t == NPY_UBYTE: f = "B" * elif t == NPY_SHORT: f = "h" * elif t == NPY_USHORT: f = "H" # <<<<<<<<<<<<<< @@ -2925,7 +2925,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":217 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":217 * elif t == NPY_SHORT: f = "h" * elif t == NPY_USHORT: f = "H" * elif t == NPY_INT: f = "i" # <<<<<<<<<<<<<< @@ -2938,7 +2938,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":218 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":218 * elif t == NPY_USHORT: f = "H" * elif t == NPY_INT: f = "i" * elif t == NPY_UINT: f = "I" # <<<<<<<<<<<<<< @@ -2951,7 +2951,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":219 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":219 * elif t == NPY_INT: f = "i" * elif t == NPY_UINT: f = "I" * elif t == NPY_LONG: f = "l" # <<<<<<<<<<<<<< @@ -2964,7 +2964,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":220 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":220 * elif t == NPY_UINT: f = "I" * elif t == NPY_LONG: f = "l" * elif t == NPY_ULONG: f = "L" # <<<<<<<<<<<<<< @@ -2977,7 +2977,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":221 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":221 * elif t == NPY_LONG: f = "l" * elif t == NPY_ULONG: f = "L" * elif t == NPY_LONGLONG: f = "q" # <<<<<<<<<<<<<< @@ -2990,7 +2990,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":222 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":222 * elif t == NPY_ULONG: f = "L" * elif t == NPY_LONGLONG: f = "q" * elif t == NPY_ULONGLONG: f = "Q" # <<<<<<<<<<<<<< @@ -3003,7 +3003,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":223 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":223 * elif t == NPY_LONGLONG: f = "q" * elif t == NPY_ULONGLONG: f = "Q" * elif t == NPY_FLOAT: f = "f" # <<<<<<<<<<<<<< @@ -3016,7 +3016,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":224 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":224 * elif t == NPY_ULONGLONG: f = "Q" * elif t == NPY_FLOAT: f = "f" * elif t == NPY_DOUBLE: f = "d" # <<<<<<<<<<<<<< @@ -3029,7 +3029,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":225 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":225 * elif t == NPY_FLOAT: f = "f" * elif t == NPY_DOUBLE: f = "d" * elif t == NPY_LONGDOUBLE: f = "g" # <<<<<<<<<<<<<< @@ -3042,7 +3042,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":226 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":226 * elif t == NPY_DOUBLE: f = "d" * elif t == NPY_LONGDOUBLE: f = "g" * elif t == NPY_CFLOAT: f = "Zf" # <<<<<<<<<<<<<< @@ -3055,7 +3055,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":227 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":227 * elif t == NPY_LONGDOUBLE: f = "g" * elif t == NPY_CFLOAT: f = "Zf" * elif t == NPY_CDOUBLE: f = "Zd" # <<<<<<<<<<<<<< @@ -3068,7 +3068,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":228 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":228 * elif t == NPY_CFLOAT: f = "Zf" * elif t == NPY_CDOUBLE: f = "Zd" * elif t == NPY_CLONGDOUBLE: f = "Zg" # <<<<<<<<<<<<<< @@ -3081,7 +3081,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":229 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":229 * elif t == NPY_CDOUBLE: f = "Zd" * elif t == NPY_CLONGDOUBLE: f = "Zg" * elif t == NPY_OBJECT: f = "O" # <<<<<<<<<<<<<< @@ -3095,7 +3095,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } /*else*/ { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":231 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":231 * elif t == NPY_OBJECT: f = "O" * else: * raise ValueError("unknown dtype code in numpy.pxd (%d)" % t) # <<<<<<<<<<<<<< @@ -3121,7 +3121,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } __pyx_L14:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":232 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":232 * else: * raise ValueError("unknown dtype code in numpy.pxd (%d)" % t) * info.format = f # <<<<<<<<<<<<<< @@ -3130,7 +3130,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_info->format = __pyx_v_f; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":233 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":233 * raise ValueError("unknown dtype code in numpy.pxd (%d)" % t) * info.format = f * return # <<<<<<<<<<<<<< @@ -3143,7 +3143,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } /*else*/ { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":235 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":235 * return * else: * info.format = stdlib.malloc(_buffer_format_string_len) # <<<<<<<<<<<<<< @@ -3152,7 +3152,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_info->format = ((char *)malloc(255)); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":236 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":236 * else: * info.format = stdlib.malloc(_buffer_format_string_len) * info.format[0] = '^' # Native data types, manual alignment # <<<<<<<<<<<<<< @@ -3161,7 +3161,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ (__pyx_v_info->format[0]) = '^'; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":237 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":237 * info.format = stdlib.malloc(_buffer_format_string_len) * info.format[0] = '^' # Native data types, manual alignment * offset = 0 # <<<<<<<<<<<<<< @@ -3170,7 +3170,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_offset = 0; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":240 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":240 * f = _util_dtypestring(descr, info.format + 1, * info.format + _buffer_format_string_len, * &offset) # <<<<<<<<<<<<<< @@ -3180,7 +3180,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf __pyx_t_7 = __pyx_f_5numpy__util_dtypestring(__pyx_v_descr, (__pyx_v_info->format + 1), (__pyx_v_info->format + 255), (&__pyx_v_offset)); if (unlikely(__pyx_t_7 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 238; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_v_f = __pyx_t_7; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":241 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":241 * info.format + _buffer_format_string_len, * &offset) * f[0] = 0 # Terminate format string # <<<<<<<<<<<<<< @@ -3212,7 +3212,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf return __pyx_r; } -/* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":243 +/* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":243 * f[0] = 0 # Terminate format string * * def __releasebuffer__(ndarray self, Py_buffer* info): # <<<<<<<<<<<<<< @@ -3225,7 +3225,7 @@ static void __pyx_pf_5numpy_7ndarray___releasebuffer__(PyObject *__pyx_v_self, P int __pyx_t_1; __Pyx_SetupRefcountContext("__releasebuffer__"); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":244 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":244 * * def __releasebuffer__(ndarray self, Py_buffer* info): * if PyArray_HASFIELDS(self): # <<<<<<<<<<<<<< @@ -3235,7 +3235,7 @@ static void __pyx_pf_5numpy_7ndarray___releasebuffer__(PyObject *__pyx_v_self, P __pyx_t_1 = PyArray_HASFIELDS(((PyArrayObject *)__pyx_v_self)); if (__pyx_t_1) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":245 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":245 * def __releasebuffer__(ndarray self, Py_buffer* info): * if PyArray_HASFIELDS(self): * stdlib.free(info.format) # <<<<<<<<<<<<<< @@ -3247,7 +3247,7 @@ static void __pyx_pf_5numpy_7ndarray___releasebuffer__(PyObject *__pyx_v_self, P } __pyx_L5:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":246 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":246 * if PyArray_HASFIELDS(self): * stdlib.free(info.format) * if sizeof(npy_intp) != sizeof(Py_ssize_t): # <<<<<<<<<<<<<< @@ -3257,7 +3257,7 @@ static void __pyx_pf_5numpy_7ndarray___releasebuffer__(PyObject *__pyx_v_self, P __pyx_t_1 = ((sizeof(npy_intp)) != (sizeof(Py_ssize_t))); if (__pyx_t_1) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":247 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":247 * stdlib.free(info.format) * if sizeof(npy_intp) != sizeof(Py_ssize_t): * stdlib.free(info.strides) # <<<<<<<<<<<<<< @@ -3272,7 +3272,7 @@ static void __pyx_pf_5numpy_7ndarray___releasebuffer__(PyObject *__pyx_v_self, P __Pyx_FinishRefcountContext(); } -/* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":690 +/* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":690 * ctypedef npy_cdouble complex_t * * cdef inline char* _util_dtypestring(dtype descr, char* f, char* end, int* offset) except NULL: # <<<<<<<<<<<<<< @@ -3308,7 +3308,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc __pyx_v_new_offset = Py_None; __Pyx_INCREF(Py_None); __pyx_v_t = Py_None; __Pyx_INCREF(Py_None); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":697 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":697 * cdef int delta_offset * cdef tuple i * cdef int endian_detector = 1 # <<<<<<<<<<<<<< @@ -3317,7 +3317,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc */ __pyx_v_endian_detector = 1; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":698 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":698 * cdef tuple i * cdef int endian_detector = 1 * cdef bint little_endian = ((&endian_detector)[0] != 0) # <<<<<<<<<<<<<< @@ -3326,7 +3326,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc */ __pyx_v_little_endian = ((((char *)(&__pyx_v_endian_detector))[0]) != 0); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":701 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":701 * cdef tuple fields * * for childname in descr.names: # <<<<<<<<<<<<<< @@ -3345,7 +3345,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc __pyx_v_childname = __pyx_t_3; __pyx_t_3 = 0; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":702 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":702 * * for childname in descr.names: * fields = descr.fields[childname] # <<<<<<<<<<<<<< @@ -3359,7 +3359,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc __pyx_v_fields = ((PyObject *)__pyx_1); __pyx_1 = 0; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":703 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":703 * for childname in descr.names: * fields = descr.fields[childname] * child, new_offset = fields # <<<<<<<<<<<<<< @@ -3382,7 +3382,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc {__pyx_filename = __pyx_f[1]; __pyx_lineno = 703; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":705 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":705 * child, new_offset = fields * * if (end - f) - (new_offset - offset[0]) < 15: # <<<<<<<<<<<<<< @@ -3407,7 +3407,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; if (__pyx_t_6) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":706 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":706 * * if (end - f) - (new_offset - offset[0]) < 15: * raise RuntimeError("Format string allocated too short, see comment in numpy.pxd") # <<<<<<<<<<<<<< @@ -3429,7 +3429,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc } __pyx_L5:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":708 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":708 * raise RuntimeError("Format string allocated too short, see comment in numpy.pxd") * * if ((child.byteorder == '>' and little_endian) or # <<<<<<<<<<<<<< @@ -3443,7 +3443,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc } if (!__pyx_t_6) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":709 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":709 * * if ((child.byteorder == '>' and little_endian) or * (child.byteorder == '<' and not little_endian)): # <<<<<<<<<<<<<< @@ -3461,7 +3461,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc } if (__pyx_t_8) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":710 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":710 * if ((child.byteorder == '>' and little_endian) or * (child.byteorder == '<' and not little_endian)): * raise ValueError("Non-native byte order not supported") # <<<<<<<<<<<<<< @@ -3483,7 +3483,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc } __pyx_L6:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":720 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":720 * * # Output padding bytes * while offset[0] < new_offset: # <<<<<<<<<<<<<< @@ -3500,7 +3500,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; if (!__pyx_t_8) break; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":721 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":721 * # Output padding bytes * while offset[0] < new_offset: * f[0] = 120 # "x"; pad byte # <<<<<<<<<<<<<< @@ -3509,7 +3509,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc */ (__pyx_v_f[0]) = 120; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":722 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":722 * while offset[0] < new_offset: * f[0] = 120 # "x"; pad byte * f += 1 # <<<<<<<<<<<<<< @@ -3518,7 +3518,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc */ __pyx_v_f += 1; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":723 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":723 * f[0] = 120 # "x"; pad byte * f += 1 * offset[0] += 1 # <<<<<<<<<<<<<< @@ -3528,7 +3528,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc (__pyx_v_offset[0]) += 1; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":725 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":725 * offset[0] += 1 * * offset[0] += child.itemsize # <<<<<<<<<<<<<< @@ -3537,7 +3537,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc */ (__pyx_v_offset[0]) += __pyx_v_child->elsize; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":727 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":727 * offset[0] += child.itemsize * * if not PyDataType_HASFIELDS(child): # <<<<<<<<<<<<<< @@ -3547,7 +3547,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc __pyx_t_8 = (!PyDataType_HASFIELDS(__pyx_v_child)); if (__pyx_t_8) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":728 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":728 * * if not PyDataType_HASFIELDS(child): * t = child.type_num # <<<<<<<<<<<<<< @@ -3560,7 +3560,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc __pyx_v_t = __pyx_t_4; __pyx_t_4 = 0; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":729 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":729 * if not PyDataType_HASFIELDS(child): * t = child.type_num * if end - f < 5: # <<<<<<<<<<<<<< @@ -3570,7 +3570,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc __pyx_t_8 = ((__pyx_v_end - __pyx_v_f) < 5); if (__pyx_t_8) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":730 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":730 * t = child.type_num * if end - f < 5: * raise RuntimeError("Format string allocated too short.") # <<<<<<<<<<<<<< @@ -3592,7 +3592,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc } __pyx_L10:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":733 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":733 * * # Until ticket #99 is fixed, use integers to avoid warnings * if t == NPY_BYTE: f[0] = 98 #"b" # <<<<<<<<<<<<<< @@ -3611,7 +3611,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":734 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":734 * # Until ticket #99 is fixed, use integers to avoid warnings * if t == NPY_BYTE: f[0] = 98 #"b" * elif t == NPY_UBYTE: f[0] = 66 #"B" # <<<<<<<<<<<<<< @@ -3630,7 +3630,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":735 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":735 * if t == NPY_BYTE: f[0] = 98 #"b" * elif t == NPY_UBYTE: f[0] = 66 #"B" * elif t == NPY_SHORT: f[0] = 104 #"h" # <<<<<<<<<<<<<< @@ -3649,7 +3649,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":736 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":736 * elif t == NPY_UBYTE: f[0] = 66 #"B" * elif t == NPY_SHORT: f[0] = 104 #"h" * elif t == NPY_USHORT: f[0] = 72 #"H" # <<<<<<<<<<<<<< @@ -3668,7 +3668,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":737 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":737 * elif t == NPY_SHORT: f[0] = 104 #"h" * elif t == NPY_USHORT: f[0] = 72 #"H" * elif t == NPY_INT: f[0] = 105 #"i" # <<<<<<<<<<<<<< @@ -3687,7 +3687,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":738 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":738 * elif t == NPY_USHORT: f[0] = 72 #"H" * elif t == NPY_INT: f[0] = 105 #"i" * elif t == NPY_UINT: f[0] = 73 #"I" # <<<<<<<<<<<<<< @@ -3706,7 +3706,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":739 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":739 * elif t == NPY_INT: f[0] = 105 #"i" * elif t == NPY_UINT: f[0] = 73 #"I" * elif t == NPY_LONG: f[0] = 108 #"l" # <<<<<<<<<<<<<< @@ -3725,7 +3725,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":740 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":740 * elif t == NPY_UINT: f[0] = 73 #"I" * elif t == NPY_LONG: f[0] = 108 #"l" * elif t == NPY_ULONG: f[0] = 76 #"L" # <<<<<<<<<<<<<< @@ -3744,7 +3744,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":741 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":741 * elif t == NPY_LONG: f[0] = 108 #"l" * elif t == NPY_ULONG: f[0] = 76 #"L" * elif t == NPY_LONGLONG: f[0] = 113 #"q" # <<<<<<<<<<<<<< @@ -3763,7 +3763,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":742 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":742 * elif t == NPY_ULONG: f[0] = 76 #"L" * elif t == NPY_LONGLONG: f[0] = 113 #"q" * elif t == NPY_ULONGLONG: f[0] = 81 #"Q" # <<<<<<<<<<<<<< @@ -3782,7 +3782,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":743 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":743 * elif t == NPY_LONGLONG: f[0] = 113 #"q" * elif t == NPY_ULONGLONG: f[0] = 81 #"Q" * elif t == NPY_FLOAT: f[0] = 102 #"f" # <<<<<<<<<<<<<< @@ -3801,7 +3801,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":744 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":744 * elif t == NPY_ULONGLONG: f[0] = 81 #"Q" * elif t == NPY_FLOAT: f[0] = 102 #"f" * elif t == NPY_DOUBLE: f[0] = 100 #"d" # <<<<<<<<<<<<<< @@ -3820,7 +3820,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":745 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":745 * elif t == NPY_FLOAT: f[0] = 102 #"f" * elif t == NPY_DOUBLE: f[0] = 100 #"d" * elif t == NPY_LONGDOUBLE: f[0] = 103 #"g" # <<<<<<<<<<<<<< @@ -3839,7 +3839,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":746 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":746 * elif t == NPY_DOUBLE: f[0] = 100 #"d" * elif t == NPY_LONGDOUBLE: f[0] = 103 #"g" * elif t == NPY_CFLOAT: f[0] = 90; f[1] = 102; f += 1 # Zf # <<<<<<<<<<<<<< @@ -3860,7 +3860,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":747 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":747 * elif t == NPY_LONGDOUBLE: f[0] = 103 #"g" * elif t == NPY_CFLOAT: f[0] = 90; f[1] = 102; f += 1 # Zf * elif t == NPY_CDOUBLE: f[0] = 90; f[1] = 100; f += 1 # Zd # <<<<<<<<<<<<<< @@ -3881,7 +3881,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":748 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":748 * elif t == NPY_CFLOAT: f[0] = 90; f[1] = 102; f += 1 # Zf * elif t == NPY_CDOUBLE: f[0] = 90; f[1] = 100; f += 1 # Zd * elif t == NPY_CLONGDOUBLE: f[0] = 90; f[1] = 103; f += 1 # Zg # <<<<<<<<<<<<<< @@ -3902,7 +3902,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":749 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":749 * elif t == NPY_CDOUBLE: f[0] = 90; f[1] = 100; f += 1 # Zd * elif t == NPY_CLONGDOUBLE: f[0] = 90; f[1] = 103; f += 1 # Zg * elif t == NPY_OBJECT: f[0] = 79 #"O" # <<<<<<<<<<<<<< @@ -3922,7 +3922,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc } /*else*/ { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":751 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":751 * elif t == NPY_OBJECT: f[0] = 79 #"O" * else: * raise ValueError("unknown dtype code in numpy.pxd (%d)" % t) # <<<<<<<<<<<<<< @@ -3945,7 +3945,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc } __pyx_L11:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":752 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":752 * else: * raise ValueError("unknown dtype code in numpy.pxd (%d)" % t) * f += 1 # <<<<<<<<<<<<<< @@ -3957,7 +3957,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc } /*else*/ { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":756 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":756 * # Cython ignores struct boundary information ("T{...}"), * # so don't output it * f = _util_dtypestring(child, f, end, offset) # <<<<<<<<<<<<<< @@ -3971,7 +3971,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc } __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":757 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":757 * # so don't output it * f = _util_dtypestring(child, f, end, offset) * return f # <<<<<<<<<<<<<< @@ -4353,7 +4353,7 @@ PyMODINIT_FUNC PyInit_opencv_backend(void) /*--- Function import code ---*/ /*--- Execution code ---*/ - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":1 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":1 * import numpy as np # <<<<<<<<<<<<<< * cimport numpy as np * from python cimport * @@ -4363,7 +4363,7 @@ PyMODINIT_FUNC PyInit_opencv_backend(void) if (PyObject_SetAttr(__pyx_m, __pyx_kp_np, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":4 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":4 * cimport numpy as np * from python cimport * * from opencv_constants import * # <<<<<<<<<<<<<< @@ -4381,7 +4381,7 @@ PyMODINIT_FUNC PyInit_opencv_backend(void) if (__pyx_import_star(__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":8 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":8 * * * np.import_array() # <<<<<<<<<<<<<< @@ -4390,7 +4390,7 @@ PyMODINIT_FUNC PyInit_opencv_backend(void) */ import_array(); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":16 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":16 * # for some reason these have to declared as dtype objects rather than just the * # dtype itself.... * UINT8 = np.dtype('uint8') # <<<<<<<<<<<<<< @@ -4408,7 +4408,7 @@ PyMODINIT_FUNC PyInit_opencv_backend(void) if (PyObject_SetAttr(__pyx_m, __pyx_kp_33, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":17 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":17 * # dtype itself.... * UINT8 = np.dtype('uint8') * INT8 = np.dtype('int8') # <<<<<<<<<<<<<< @@ -4426,7 +4426,7 @@ PyMODINIT_FUNC PyInit_opencv_backend(void) if (PyObject_SetAttr(__pyx_m, __pyx_kp_35, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":18 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":18 * UINT8 = np.dtype('uint8') * INT8 = np.dtype('int8') * INT16 = np.dtype('int16') # <<<<<<<<<<<<<< @@ -4444,7 +4444,7 @@ PyMODINIT_FUNC PyInit_opencv_backend(void) if (PyObject_SetAttr(__pyx_m, __pyx_kp_37, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":19 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":19 * INT8 = np.dtype('int8') * INT16 = np.dtype('int16') * INT32 = np.dtype('int32') # <<<<<<<<<<<<<< @@ -4462,7 +4462,7 @@ PyMODINIT_FUNC PyInit_opencv_backend(void) if (PyObject_SetAttr(__pyx_m, __pyx_kp_39, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":20 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":20 * INT16 = np.dtype('int16') * INT32 = np.dtype('int32') * FLOAT32 = np.dtype('float32') # <<<<<<<<<<<<<< @@ -4480,7 +4480,7 @@ PyMODINIT_FUNC PyInit_opencv_backend(void) if (PyObject_SetAttr(__pyx_m, __pyx_kp_41, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":21 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":21 * INT32 = np.dtype('int32') * FLOAT32 = np.dtype('float32') * FLOAT64 = np.dtype('float64') # <<<<<<<<<<<<<< @@ -4498,7 +4498,7 @@ PyMODINIT_FUNC PyInit_opencv_backend(void) if (PyObject_SetAttr(__pyx_m, __pyx_kp_43, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":23 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":23 * FLOAT64 = np.dtype('float64') * * cdef int IPL_DEPTH_SIGN = 0x80000000 # <<<<<<<<<<<<<< @@ -4507,7 +4507,7 @@ PyMODINIT_FUNC PyInit_opencv_backend(void) */ __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_SIGN = 0x80000000; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":24 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":24 * * cdef int IPL_DEPTH_SIGN = 0x80000000 * cdef int IPL_DEPTH_8U = 8 # <<<<<<<<<<<<<< @@ -4516,7 +4516,7 @@ PyMODINIT_FUNC PyInit_opencv_backend(void) */ __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_8U = 8; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":25 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":25 * cdef int IPL_DEPTH_SIGN = 0x80000000 * cdef int IPL_DEPTH_8U = 8 * cdef int IPL_DEPTH_8S = (IPL_DEPTH_SIGN | 8) # <<<<<<<<<<<<<< @@ -4525,7 +4525,7 @@ PyMODINIT_FUNC PyInit_opencv_backend(void) */ __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_8S = (__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_SIGN | 8); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":26 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":26 * cdef int IPL_DEPTH_8U = 8 * cdef int IPL_DEPTH_8S = (IPL_DEPTH_SIGN | 8) * cdef int IPL_DEPTH_16S = (IPL_DEPTH_SIGN | 16) # <<<<<<<<<<<<<< @@ -4534,7 +4534,7 @@ PyMODINIT_FUNC PyInit_opencv_backend(void) */ __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_16S = (__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_SIGN | 16); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":27 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":27 * cdef int IPL_DEPTH_8S = (IPL_DEPTH_SIGN | 8) * cdef int IPL_DEPTH_16S = (IPL_DEPTH_SIGN | 16) * cdef int IPL_DEPTH_32S = (IPL_DEPTH_SIGN | 32) # <<<<<<<<<<<<<< @@ -4543,7 +4543,7 @@ PyMODINIT_FUNC PyInit_opencv_backend(void) */ __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_32S = (__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_SIGN | 32); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":28 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":28 * cdef int IPL_DEPTH_16S = (IPL_DEPTH_SIGN | 16) * cdef int IPL_DEPTH_32S = (IPL_DEPTH_SIGN | 32) * cdef int IPL_DEPTH_32F = 32 # <<<<<<<<<<<<<< @@ -4552,7 +4552,7 @@ PyMODINIT_FUNC PyInit_opencv_backend(void) */ __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_32F = 32; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":29 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":29 * cdef int IPL_DEPTH_32S = (IPL_DEPTH_SIGN | 32) * cdef int IPL_DEPTH_32F = 32 * cdef int IPL_DEPTH_64F = 64 # <<<<<<<<<<<<<< @@ -4561,7 +4561,7 @@ PyMODINIT_FUNC PyInit_opencv_backend(void) */ __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_64F = 64; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":34 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":34 * # I'd like a better to associate the IPL data type flag to the proper numpy * # types without using a dictionary. * _ipltypes = {UINT8: IPL_DEPTH_8U, INT8: IPL_DEPTH_8S, INT16: IPL_DEPTH_16S, # <<<<<<<<<<<<<< @@ -4592,7 +4592,7 @@ PyMODINIT_FUNC PyInit_opencv_backend(void) __Pyx_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":35 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":35 * # types without using a dictionary. * _ipltypes = {UINT8: IPL_DEPTH_8U, INT8: IPL_DEPTH_8S, INT16: IPL_DEPTH_16S, * INT32: IPL_DEPTH_32S, FLOAT32: IPL_DEPTH_32F, # <<<<<<<<<<<<<< @@ -4614,7 +4614,7 @@ PyMODINIT_FUNC PyInit_opencv_backend(void) __Pyx_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":36 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":36 * _ipltypes = {UINT8: IPL_DEPTH_8U, INT8: IPL_DEPTH_8S, INT16: IPL_DEPTH_16S, * INT32: IPL_DEPTH_32S, FLOAT32: IPL_DEPTH_32F, * FLOAT64: IPL_DEPTH_64F} # <<<<<<<<<<<<<< @@ -4631,7 +4631,7 @@ PyMODINIT_FUNC PyInit_opencv_backend(void) if (PyObject_SetAttr(__pyx_m, __pyx_kp__ipltypes, ((PyObject *)__pyx_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_1)); __pyx_1 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":44 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":44 * * * cdef int IPLIMAGE_SIZE = sizeof(IplImage) # <<<<<<<<<<<<<< @@ -4640,7 +4640,7 @@ PyMODINIT_FUNC PyInit_opencv_backend(void) */ __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPLIMAGE_SIZE = (sizeof(__pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage)); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/python_mem.pxd":1 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/python_mem.pxd":1 * cdef extern from "Python.h": # <<<<<<<<<<<<<< * * ##################################################################### diff --git a/scikits/image/opencv/opencv_constants.py b/scikits/image/opencv/opencv_constants.py index 566834cc..fd8d12b4 100644 --- a/scikits/image/opencv/opencv_constants.py +++ b/scikits/image/opencv/opencv_constants.py @@ -1,6 +1,6 @@ ############################################# -# Constants (need a better place for these) +# Image Processing Constants ############################################ diff --git a/scikits/image/opencv/opencv_cv.c b/scikits/image/opencv/opencv_cv.c index faebc77b..c155027c 100644 --- a/scikits/image/opencv/opencv_cv.c +++ b/scikits/image/opencv/opencv_cv.c @@ -1,4 +1,4 @@ -/* Generated by Cython 0.11.3 on Thu Oct 15 13:25:00 2009 */ +/* Generated by Cython 0.11.3 on Fri Oct 16 01:13:49 2009 */ #define PY_SSIZE_T_CLEAN #include "Python.h" @@ -304,6 +304,8 @@ static void __Pyx_RaiseArgtupleInvalid(const char* func_name, int exact, static int __Pyx_ParseOptionalKeywords(PyObject *kwds, PyObject **argnames[], PyObject *kwds2, PyObject *values[], Py_ssize_t num_pos_args, const char* function_name); /*proto*/ +static int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); /*proto*/ + static INLINE PyObject *__Pyx_GetItemInt_Generic(PyObject *o, PyObject* j) { PyObject *r; @@ -378,8 +380,6 @@ static INLINE PyObject *__Pyx_GetItemInt_Fast(PyObject *o, Py_ssize_t i, int fit return r; } -static int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); /*proto*/ - static INLINE void __Pyx_RaiseNoneNotIterableError(void); static INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index); @@ -395,13 +395,15 @@ static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list); /*proto*/ static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name); /*proto*/ -static INLINE npy_intp __Pyx_PyInt_from_py_npy_intp(PyObject *); - static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); /*proto*/ static INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb); /*proto*/ static INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb); /*proto*/ +static INLINE npy_intp __Pyx_PyInt_from_py_npy_intp(PyObject *); + +static INLINE PyObject *__Pyx_PyInt_to_py_npy_intp(npy_intp); + #if __PYX_USE_C99_COMPLEX #define __Pyx_REAL_PART(z) __real__(z) #define __Pyx_IMAG_PART(z) __imag__(z) @@ -709,7 +711,7 @@ typedef npy_clongdouble __pyx_t_5numpy_clongdouble_t; typedef npy_cdouble __pyx_t_5numpy_complex_t; -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_type.pxd":5 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_type.pxd":5 * # available at build time. * * cdef struct _IplImage: # <<<<<<<<<<<<<< @@ -744,7 +746,7 @@ struct __pyx_t_7scikits_5image_6opencv_11opencv_type__IplImage { typedef struct __pyx_t_7scikits_5image_6opencv_11opencv_type__IplImage __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage; -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_type.pxd":38 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_type.pxd":38 * ctypedef _IplImage IplImage * * cdef struct CvPoint2D32f: # <<<<<<<<<<<<<< @@ -757,7 +759,7 @@ struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f { float y; }; -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_type.pxd":42 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_type.pxd":42 * float y * * cdef struct CvSize: # <<<<<<<<<<<<<< @@ -770,7 +772,7 @@ struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvSize { int height; }; -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_type.pxd":46 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_type.pxd":46 * int height * * cdef struct CvTermCriteria: # <<<<<<<<<<<<<< @@ -812,15 +814,15 @@ typedef void (*__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCornerHarrisPtr)(__p typedef void (*__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPixPtr)(__pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *, int, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvSize, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvSize, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria); -typedef void (*__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCornersPtr)(__pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvSize, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *, int *, int); - -typedef void (*__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCornersPtr)(__pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvSize, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *, int, int); - typedef void (*__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvSmoothPtr)(__pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *, __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *, int, int, int, double, double); typedef void (*__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTrackPtr)(__pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *, __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *, __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *, int *, double, double, __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *, int, int, double); typedef void (*__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvResizePtr)(__pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *, __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *, int); + +typedef void (*__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCornersPtr)(__pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvSize, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *, int *, int); + +typedef void (*__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCornersPtr)(__pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvSize, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *, int, int); /* Module declarations from python_buffer */ /* Module declarations from stdlib */ @@ -919,38 +921,32 @@ static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAndVecsPtr __ static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenValPtr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCornerMinEigenVal; static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCornerHarrisPtr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCornerHarris; static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPixPtr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvFindCornerSubPix; -static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCornersPtr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvFindChessboardCorners; -static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCornersPtr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvDrawChessboardCorners; static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvSmoothPtr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvSmooth; static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTrackPtr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvGoodFeaturesToTrack; static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvResizePtr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvResize; +static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCornersPtr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvFindChessboardCorners; +static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCornersPtr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvDrawChessboardCorners; +static PyObject *__pyx_k_42 = 0; static int __pyx_k_43; static PyObject *__pyx_k_44 = 0; static int __pyx_k_45; -static PyObject *__pyx_k_46 = 0; static int __pyx_k_47; +static PyObject *__pyx_k_48 = 0; #define __Pyx_MODULE_NAME "scikits.image.opencv.opencv_cv" int __pyx_module_is_main_scikits__image__opencv__opencv_cv = 0; /* Implementation of scikits.image.opencv.opencv_cv */ static PyObject *__pyx_int_neg_1; static PyObject *__pyx_int_1; -static PyObject *__pyx_int_3; static PyObject *__pyx_int_6; static PyObject *__pyx_int_2; -static PyObject *__pyx_int_0; +static PyObject *__pyx_int_3; static char __pyx_k___main__[] = "__main__"; static PyObject *__pyx_kp___main__; static char __pyx_k_src[] = "src"; static PyObject *__pyx_kp_src; -static char __pyx_k_pattern_size[] = "pattern_size"; -static PyObject *__pyx_kp_pattern_size; -static char __pyx_k_flags[] = "flags"; -static PyObject *__pyx_kp_flags; static char __pyx_k_out[] = "out"; static PyObject *__pyx_kp_out; -static char __pyx_k_corners[] = "corners"; -static PyObject *__pyx_kp_corners; static char __pyx_k_xorder[] = "xorder"; static PyObject *__pyx_kp_xorder; static char __pyx_k_yorder[] = "yorder"; @@ -965,6 +961,8 @@ static char __pyx_k_block_size[] = "block_size"; static PyObject *__pyx_kp_block_size; static char __pyx_k_k[] = "k"; static PyObject *__pyx_kp_k; +static char __pyx_k_corners[] = "corners"; +static PyObject *__pyx_kp_corners; static char __pyx_k_count[] = "count"; static PyObject *__pyx_kp_count; static char __pyx_k_win[] = "win"; @@ -1003,6 +1001,10 @@ static char __pyx_k_width[] = "width"; static PyObject *__pyx_kp_width; static char __pyx_k_method[] = "method"; static PyObject *__pyx_kp_method; +static char __pyx_k_pattern_size[] = "pattern_size"; +static PyObject *__pyx_kp_pattern_size; +static char __pyx_k_flags[] = "flags"; +static PyObject *__pyx_kp_flags; static char __pyx_k_ctypes[] = "ctypes"; static PyObject *__pyx_kp_ctypes; static char __pyx_k_numpy[] = "numpy"; @@ -1039,34 +1041,34 @@ static char __pyx_k_cvCornerHarris[] = "cvCornerHarris"; static PyObject *__pyx_kp_cvCornerHarris; static char __pyx_k_cvFindCornerSubPix[] = "cvFindCornerSubPix"; static PyObject *__pyx_kp_cvFindCornerSubPix; -static char __pyx_k_39[] = "cvFindChessboardCorners"; -static PyObject *__pyx_kp_39; -static char __pyx_k_40[] = "cvDrawChessboardCorners"; -static PyObject *__pyx_kp_40; static char __pyx_k_cvSmooth[] = "cvSmooth"; static PyObject *__pyx_kp_cvSmooth; -static char __pyx_k_41[] = "cvGoodFeaturesToTrack"; -static PyObject *__pyx_kp_41; +static char __pyx_k_39[] = "cvGoodFeaturesToTrack"; +static PyObject *__pyx_kp_39; static char __pyx_k_cvResize[] = "cvResize"; static PyObject *__pyx_kp_cvResize; -static char __pyx_k_42[] = "CV_CALIB_CB_ADAPTIVE_THRESH"; -static PyObject *__pyx_kp_42; +static char __pyx_k_40[] = "cvFindChessboardCorners"; +static PyObject *__pyx_kp_40; +static char __pyx_k_41[] = "cvDrawChessboardCorners"; +static PyObject *__pyx_kp_41; static char __pyx_k_CV_GAUSSIAN[] = "CV_GAUSSIAN"; static PyObject *__pyx_kp_CV_GAUSSIAN; static char __pyx_k_CV_INTER_LINEAR[] = "CV_INTER_LINEAR"; static PyObject *__pyx_kp_CV_INTER_LINEAR; -static char __pyx_k_48[] = "UINT8"; -static PyObject *__pyx_kp_48; -static char __pyx_k_49[] = "FLOAT32"; +static char __pyx_k_46[] = "CV_CALIB_CB_ADAPTIVE_THRESH"; +static PyObject *__pyx_kp_46; +static char __pyx_k_49[] = "UINT8"; static PyObject *__pyx_kp_49; static char __pyx_k_50[] = "INT8"; static PyObject *__pyx_kp_50; +static char __pyx_k_51[] = "FLOAT32"; +static PyObject *__pyx_kp_51; static char __pyx_k_ValueError[] = "ValueError"; static PyObject *__pyx_kp_ValueError; static char __pyx_k_dtype[] = "dtype"; static PyObject *__pyx_kp_dtype; -static char __pyx_k_52[] = "INT16"; -static PyObject *__pyx_kp_52; +static char __pyx_k_53[] = "INT16"; +static PyObject *__pyx_kp_53; static char __pyx_k_reshape[] = "reshape"; static PyObject *__pyx_kp_reshape; static char __pyx_k_shape[] = "shape"; @@ -1077,15 +1079,12 @@ static char __pyx_k_RuntimeError[] = "RuntimeError"; static PyObject *__pyx_kp_RuntimeError; static char __pyx_k_CV_BLUR[] = "CV_BLUR"; static PyObject *__pyx_kp_CV_BLUR; -static char __pyx_k_range[] = "range"; -static PyObject *__pyx_kp_range; +static char __pyx_k_copy[] = "copy"; +static PyObject *__pyx_kp_copy; static PyObject *__pyx_builtin_ValueError; static PyObject *__pyx_builtin_RuntimeError; -static PyObject *__pyx_builtin_range; -static PyObject *__pyx_kp_51; -static char __pyx_k_51[] = "aperture_size must be 3, 5, or 7"; -static PyObject *__pyx_kp_53; -static char __pyx_k_53[] = "aperture_size must be 3, 5, or 7"; +static PyObject *__pyx_kp_52; +static char __pyx_k_52[] = "aperture_size must be 3, 5, or 7"; static PyObject *__pyx_kp_54; static char __pyx_k_54[] = "aperture_size must be 3, 5, or 7"; static PyObject *__pyx_kp_55; @@ -1097,13 +1096,15 @@ static char __pyx_k_57[] = "aperture_size must be 3, 5, or 7"; static PyObject *__pyx_kp_58; static char __pyx_k_58[] = "aperture_size must be 3, 5, or 7"; static PyObject *__pyx_kp_59; -static char __pyx_k_59[] = "The number of declared points is different than exists in the array."; +static char __pyx_k_59[] = "aperture_size must be 3, 5, or 7"; static PyObject *__pyx_kp_60; +static char __pyx_k_60[] = "The number of declared points is different than exists in the array."; static PyObject *__pyx_kp_61; -static char __pyx_k_60[] = "In place operation not supported with this filter"; -static char __pyx_k_61[] = "In place operation not supported with this filter"; static PyObject *__pyx_kp_62; -static char __pyx_k_62[] = "width and height must not be none"; +static char __pyx_k_61[] = "In place operation not supported with this filter"; +static char __pyx_k_62[] = "In place operation not supported with this filter"; +static PyObject *__pyx_kp_63; +static char __pyx_k_63[] = "width and height must not be none"; static PyObject *__pyx_int_15; static char __pyx_k___getbuffer__[] = "__getbuffer__"; static PyObject *__pyx_kp___getbuffer__; @@ -1111,10 +1112,13 @@ static char __pyx_k___releasebuffer__[] = "__releasebuffer__"; static PyObject *__pyx_kp___releasebuffer__; static char __pyx_k_info[] = "info"; static PyObject *__pyx_kp_info; +static char __pyx_k_range[] = "range"; +static PyObject *__pyx_kp_range; static PyObject *__pyx_kp_1; static PyObject *__pyx_kp_2; static PyObject *__pyx_kp_5; static PyObject *__pyx_kp_23; +static PyObject *__pyx_builtin_range; static char __pyx_k_1[] = "ndarray is not C contiguous"; static char __pyx_k_2[] = "ndarray is not Fortran contiguous"; static char __pyx_k_3[] = ">"; @@ -1150,477 +1154,8 @@ static char __pyx_k_28[] = "Non-native byte order not supported"; static char __pyx_k_29[] = "Format string allocated too short."; static char __pyx_k_30[] = "unknown dtype code in numpy.pxd (%d)"; -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":100 - * # Function Implementations - * #################################### - * def cvFindChessboardCorners(np.ndarray src, pattern_size, int flags = CV_CALIB_CB_ADAPTIVE_THRESH): # <<<<<<<<<<<<<< - * """ - * Wrapper around the OpenCV cvFindChessboardCorners function. - */ - -static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCorners(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ -static char __pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCorners[] = "\n Wrapper around the OpenCV cvFindChessboardCorners function.\n\n src - Image to search for chessboard corners\n pattern_size - Tuple of inner corners (w,h)\n flags - directly passed through to OpenCV\n "; -static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCorners(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { - PyArrayObject *__pyx_v_src = 0; - PyObject *__pyx_v_pattern_size = 0; - int __pyx_v_flags; - npy_intp __pyx_v_outshape[2]; - PyObject *__pyx_v_points; - struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *__pyx_v_cvpoints; - struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvSize __pyx_v_cvpattern_size; - __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_srcimg; - int __pyx_v_ncorners_found; - PyObject *__pyx_r = NULL; - PyObject *__pyx_1 = 0; - int __pyx_t_1; - PyObject *__pyx_t_2 = NULL; - PyObject *__pyx_t_3 = NULL; - npy_intp __pyx_t_4; - static PyObject **__pyx_pyargnames[] = {&__pyx_kp_src,&__pyx_kp_pattern_size,&__pyx_kp_flags,0}; - __Pyx_SetupRefcountContext("cvFindChessboardCorners"); - __pyx_self = __pyx_self; - if (unlikely(__pyx_kwds)) { - Py_ssize_t kw_args = PyDict_Size(__pyx_kwds); - PyObject* values[3] = {0,0,0}; - switch (PyTuple_GET_SIZE(__pyx_args)) { - case 3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2); - case 2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1); - case 1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0); - case 0: break; - default: goto __pyx_L5_argtuple_error; - } - switch (PyTuple_GET_SIZE(__pyx_args)) { - case 0: - values[0] = PyDict_GetItem(__pyx_kwds, __pyx_kp_src); - if (likely(values[0])) kw_args--; - else goto __pyx_L5_argtuple_error; - case 1: - values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_pattern_size); - if (likely(values[1])) kw_args--; - else { - __Pyx_RaiseArgtupleInvalid("cvFindChessboardCorners", 0, 2, 3, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - } - case 2: - if (kw_args > 0) { - PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_flags); - if (unlikely(value)) { values[2] = value; kw_args--; } - } - } - if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvFindChessboardCorners") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - } - __pyx_v_src = ((PyArrayObject *)values[0]); - __pyx_v_pattern_size = values[1]; - if (values[2]) { - __pyx_v_flags = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - } else { - __pyx_v_flags = __pyx_k_43; - } - } else { - __pyx_v_flags = __pyx_k_43; - switch (PyTuple_GET_SIZE(__pyx_args)) { - case 3: - __pyx_v_flags = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - case 2: - __pyx_v_pattern_size = PyTuple_GET_ITEM(__pyx_args, 1); - __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); - break; - default: goto __pyx_L5_argtuple_error; - } - } - goto __pyx_L4_argument_unpacking_done; - __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvFindChessboardCorners", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - __pyx_L3_error:; - __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvFindChessboardCorners"); - return NULL; - __pyx_L4_argument_unpacking_done:; - __pyx_v_points = Py_None; __Pyx_INCREF(Py_None); - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":108 - * flags - directly passed through to OpenCV - * """ - * validate_array(src) # <<<<<<<<<<<<<< +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":104 * - * assert_nchannels(src, [1, 3]) - */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 108; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":110 - * validate_array(src) - * - * assert_nchannels(src, [1, 3]) # <<<<<<<<<<<<<< - * assert_dtype(src, [UINT8]) - * - */ - __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(((PyObject *)__pyx_t_2)); - __Pyx_INCREF(__pyx_int_1); - PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1); - __Pyx_GIVEREF(__pyx_int_1); - __Pyx_INCREF(__pyx_int_3); - PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3); - __Pyx_GIVEREF(__pyx_int_3); - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":111 - * - * assert_nchannels(src, [1, 3]) - * assert_dtype(src, [UINT8]) # <<<<<<<<<<<<<< - * - * cdef np.npy_intp outshape[2] - */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_48); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_1); - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(((PyObject *)__pyx_t_2)); - PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1); - __Pyx_GIVEREF(__pyx_1); - __pyx_1 = 0; - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":114 - * - * cdef np.npy_intp outshape[2] - * outshape[0] = pattern_size[1]*pattern_size[0] # <<<<<<<<<<<<<< - * outshape[1] = 2 # pattern_size[0] - * - */ - __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_1); - __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_t_2 = PyInt_FromLong(((int)__pyx_t_1)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_1); - __pyx_t_3 = PyNumber_Multiply(__pyx_t_2, __pyx_1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_t_4 = __Pyx_PyInt_from_py_npy_intp(__pyx_t_3); if (unlikely((__pyx_t_4 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - (__pyx_v_outshape[0]) = __pyx_t_4; - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":115 - * cdef np.npy_intp outshape[2] - * outshape[0] = pattern_size[1]*pattern_size[0] - * outshape[1] = 2 # pattern_size[0] # <<<<<<<<<<<<<< - * - * points = new_array(2, outshape, FLOAT32) - */ - (__pyx_v_outshape[1]) = ((int)2); - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":117 - * outshape[1] = 2 # pattern_size[0] - * - * points = new_array(2, outshape, FLOAT32) # <<<<<<<<<<<<<< - * cdef CvPoint2D32f* cvpoints = array_as_cvPoint2D32f_ptr(points) - * - */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_1); - __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(2, __pyx_v_outshape, __pyx_1)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __Pyx_DECREF(__pyx_v_points); - __pyx_v_points = __pyx_t_3; - __pyx_t_3 = 0; - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":118 - * - * points = new_array(2, outshape, FLOAT32) - * cdef CvPoint2D32f* cvpoints = array_as_cvPoint2D32f_ptr(points) # <<<<<<<<<<<<<< - * - * cdef CvSize cvpattern_size - */ - if (!(__Pyx_TypeTest(__pyx_v_points, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_v_cvpoints = __pyx_f_7scikits_5image_6opencv_14opencv_backend_array_as_cvPoint2D32f_ptr(((PyArrayObject *)__pyx_v_points)); - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":121 - * - * cdef CvSize cvpattern_size - * cvpattern_size.height = pattern_size[1] # <<<<<<<<<<<<<< - * cvpattern_size.width = pattern_size[0] - * - */ - __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_1); - __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_v_cvpattern_size.height = __pyx_t_1; - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":122 - * cdef CvSize cvpattern_size - * cvpattern_size.height = pattern_size[1] - * cvpattern_size.width = pattern_size[0] # <<<<<<<<<<<<<< - * - * cdef IplImage srcimg - */ - __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_1); - __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_v_cvpattern_size.width = __pyx_t_1; - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":125 - * - * cdef IplImage srcimg - * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< - * - * cdef int ncorners_found - */ - __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg)); - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":128 - * - * cdef int ncorners_found - * c_cvFindChessboardCorners(&srcimg, cvpattern_size, cvpoints, &ncorners_found, flags) # <<<<<<<<<<<<<< - * - * return points[:ncorners_found] - */ - __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvFindChessboardCorners((&__pyx_v_srcimg), __pyx_v_cvpattern_size, __pyx_v_cvpoints, (&__pyx_v_ncorners_found), __pyx_v_flags); - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":130 - * c_cvFindChessboardCorners(&srcimg, cvpattern_size, cvpoints, &ncorners_found, flags) - * - * return points[:ncorners_found] # <<<<<<<<<<<<<< - * - * def cvDrawChessboardCorners(np.ndarray out, pattern_size, np.ndarray corners): - */ - __Pyx_XDECREF(__pyx_r); - __pyx_1 = PySequence_GetSlice(__pyx_v_points, 0, __pyx_v_ncorners_found); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 130; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_1); - __pyx_r = __pyx_1; - __pyx_1 = 0; - goto __pyx_L0; - - __pyx_r = Py_None; __Pyx_INCREF(Py_None); - goto __pyx_L0; - __pyx_L1_error:; - __Pyx_XDECREF(__pyx_1); - __Pyx_XDECREF(__pyx_t_2); - __Pyx_XDECREF(__pyx_t_3); - __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvFindChessboardCorners"); - __pyx_r = NULL; - __pyx_L0:; - __Pyx_DECREF(__pyx_v_points); - __Pyx_XGIVEREF(__pyx_r); - __Pyx_FinishRefcountContext(); - return __pyx_r; -} - -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":132 - * return points[:ncorners_found] - * - * def cvDrawChessboardCorners(np.ndarray out, pattern_size, np.ndarray corners): # <<<<<<<<<<<<<< - * """ - * Wrapper around the OpenCV cvDrawChessboardCorners function. - */ - -static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCorners(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ -static char __pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCorners[] = "\n Wrapper around the OpenCV cvDrawChessboardCorners function.\n\n Parameters\n ----------\n out : ndarray, dim 3, dtype: uint8\n Image to draw into\n pattern_size : array_like, shape (2,)\n Number of inner corners (w,h)\n corners : ndarray, shape (n,2), dtype: float32\n Corners found in the image. See cvFindChessboardCorners and\n cvFindCornerSubPix\n "; -static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCorners(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { - PyArrayObject *__pyx_v_out = 0; - PyObject *__pyx_v_pattern_size = 0; - PyArrayObject *__pyx_v_corners = 0; - struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvSize __pyx_v_cvpattern_size; - __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_img; - struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *__pyx_v_cvcorners; - int __pyx_v_ncount; - PyObject *__pyx_r = NULL; - PyObject *__pyx_1 = 0; - PyObject *__pyx_2 = 0; - int __pyx_t_1; - PyObject *__pyx_t_2 = NULL; - Py_ssize_t __pyx_t_3; - static PyObject **__pyx_pyargnames[] = {&__pyx_kp_out,&__pyx_kp_pattern_size,&__pyx_kp_corners,0}; - __Pyx_SetupRefcountContext("cvDrawChessboardCorners"); - __pyx_self = __pyx_self; - if (unlikely(__pyx_kwds)) { - Py_ssize_t kw_args = PyDict_Size(__pyx_kwds); - PyObject* values[3] = {0,0,0}; - switch (PyTuple_GET_SIZE(__pyx_args)) { - case 3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2); - case 2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1); - case 1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0); - case 0: break; - default: goto __pyx_L5_argtuple_error; - } - switch (PyTuple_GET_SIZE(__pyx_args)) { - case 0: - values[0] = PyDict_GetItem(__pyx_kwds, __pyx_kp_out); - if (likely(values[0])) kw_args--; - else goto __pyx_L5_argtuple_error; - case 1: - values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_pattern_size); - if (likely(values[1])) kw_args--; - else { - __Pyx_RaiseArgtupleInvalid("cvDrawChessboardCorners", 1, 3, 3, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - } - case 2: - values[2] = PyDict_GetItem(__pyx_kwds, __pyx_kp_corners); - if (likely(values[2])) kw_args--; - else { - __Pyx_RaiseArgtupleInvalid("cvDrawChessboardCorners", 1, 3, 3, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - } - } - if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvDrawChessboardCorners") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - } - __pyx_v_out = ((PyArrayObject *)values[0]); - __pyx_v_pattern_size = values[1]; - __pyx_v_corners = ((PyArrayObject *)values[2]); - } else if (PyTuple_GET_SIZE(__pyx_args) != 3) { - goto __pyx_L5_argtuple_error; - } else { - __pyx_v_out = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); - __pyx_v_pattern_size = PyTuple_GET_ITEM(__pyx_args, 1); - __pyx_v_corners = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 2)); - } - goto __pyx_L4_argument_unpacking_done; - __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvDrawChessboardCorners", 1, 3, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - __pyx_L3_error:; - __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvDrawChessboardCorners"); - return NULL; - __pyx_L4_argument_unpacking_done:; - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_out), __pyx_ptype_5numpy_ndarray, 1, "out", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_corners), __pyx_ptype_5numpy_ndarray, 1, "corners", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":146 - * cvFindCornerSubPix - * """ - * validate_array(out) # <<<<<<<<<<<<<< - * - * assert_nchannels(out, [3]) - */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":148 - * validate_array(out) - * - * assert_nchannels(out, [3]) # <<<<<<<<<<<<<< - * assert_dtype(out, [UINT8]) - * - */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 148; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(((PyObject *)__pyx_t_2)); - __Pyx_INCREF(__pyx_int_3); - PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_3); - __Pyx_GIVEREF(__pyx_int_3); - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_out, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 148; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":149 - * - * assert_nchannels(out, [3]) - * assert_dtype(out, [UINT8]) # <<<<<<<<<<<<<< - * - * cdef CvSize cvpattern_size - */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_48); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_1); - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(((PyObject *)__pyx_t_2)); - PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1); - __Pyx_GIVEREF(__pyx_1); - __pyx_1 = 0; - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":152 - * - * cdef CvSize cvpattern_size - * cvpattern_size.height = pattern_size[1] # <<<<<<<<<<<<<< - * cvpattern_size.width = pattern_size[0] - * - */ - __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_1); - __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_v_cvpattern_size.height = __pyx_t_1; - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":153 - * cdef CvSize cvpattern_size - * cvpattern_size.height = pattern_size[1] - * cvpattern_size.width = pattern_size[0] # <<<<<<<<<<<<<< - * - * cdef IplImage img - */ - __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_1); - __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_v_cvpattern_size.width = __pyx_t_1; - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":156 - * - * cdef IplImage img - * populate_iplimage(out, &img) # <<<<<<<<<<<<<< - * - * cdef CvPoint2D32f* cvcorners = array_as_cvPoint2D32f_ptr(corners) - */ - __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_img)); - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":158 - * populate_iplimage(out, &img) - * - * cdef CvPoint2D32f* cvcorners = array_as_cvPoint2D32f_ptr(corners) # <<<<<<<<<<<<<< - * - * cdef int ncount = pattern_size[0]*pattern_size[1] - */ - __pyx_v_cvcorners = __pyx_f_7scikits_5image_6opencv_14opencv_backend_array_as_cvPoint2D32f_ptr(__pyx_v_corners); - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":160 - * cdef CvPoint2D32f* cvcorners = array_as_cvPoint2D32f_ptr(corners) - * - * cdef int ncount = pattern_size[0]*pattern_size[1] # <<<<<<<<<<<<<< - * c_cvDrawChessboardCorners(&img, cvpattern_size, cvcorners, - * ncount, len(corners) == ncount) - */ - __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_2); - __pyx_t_2 = PyNumber_Multiply(__pyx_1, __pyx_2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __Pyx_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_v_ncount = __pyx_t_1; - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":162 - * cdef int ncount = pattern_size[0]*pattern_size[1] - * c_cvDrawChessboardCorners(&img, cvpattern_size, cvcorners, - * ncount, len(corners) == ncount) # <<<<<<<<<<<<<< - * - * def cvSobel(np.ndarray src, np.ndarray out=None, int xorder=1, int yorder=0, - */ - __pyx_t_3 = PyObject_Length(((PyObject *)__pyx_v_corners)); if (unlikely(__pyx_t_3 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 162; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvDrawChessboardCorners((&__pyx_v_img), __pyx_v_cvpattern_size, __pyx_v_cvcorners, __pyx_v_ncount, (((int)__pyx_t_3) == __pyx_v_ncount)); - - __pyx_r = Py_None; __Pyx_INCREF(Py_None); - goto __pyx_L0; - __pyx_L1_error:; - __Pyx_XDECREF(__pyx_1); - __Pyx_XDECREF(__pyx_2); - __Pyx_XDECREF(__pyx_t_2); - __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvDrawChessboardCorners"); - __pyx_r = NULL; - __pyx_L0:; - __Pyx_XGIVEREF(__pyx_r); - __Pyx_FinishRefcountContext(); - return __pyx_r; -} - -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":164 - * ncount, len(corners) == ncount) * * def cvSobel(np.ndarray src, np.ndarray out=None, int xorder=1, int yorder=0, # <<<<<<<<<<<<<< * int aperture_size=3): @@ -1690,22 +1225,22 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvSobel") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvSobel") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); __pyx_v_out = ((PyArrayObject *)values[1]); if (values[2]) { - __pyx_v_xorder = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_xorder == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_xorder = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_xorder == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_xorder = 1; } if (values[3]) { - __pyx_v_yorder = __Pyx_PyInt_AsInt(values[3]); if (unlikely((__pyx_v_yorder == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_yorder = __Pyx_PyInt_AsInt(values[3]); if (unlikely((__pyx_v_yorder == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_yorder = 0; } if (values[4]) { - __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[4]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[4]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 105; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_aperture_size = 3; } @@ -1715,9 +1250,9 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ __pyx_v_yorder = 0; __pyx_v_aperture_size = 3; switch (PyTuple_GET_SIZE(__pyx_args)) { - case 5: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 4)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - case 4: __pyx_v_yorder = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely((__pyx_v_yorder == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - case 3: __pyx_v_xorder = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_xorder == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 5: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 4)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 105; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 4: __pyx_v_yorder = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely((__pyx_v_yorder == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 3: __pyx_v_xorder = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_xorder == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 2: __pyx_v_out = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1)); case 1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); break; @@ -1726,38 +1261,38 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvSobel", 0, 1, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvSobel", 0, 1, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvSobel"); return NULL; __pyx_L4_argument_unpacking_done:; __Pyx_INCREF((PyObject *)__pyx_v_out); - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_out), __pyx_ptype_5numpy_ndarray, 1, "out", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_out), __pyx_ptype_5numpy_ndarray, 1, "out", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":173 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":113 * """ * * validate_array(src) # <<<<<<<<<<<<<< * assert_dtype(src, [UINT8, INT8, FLOAT32]) * assert_nchannels(src, [1]) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":174 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":114 * * validate_array(src) * assert_dtype(src, [UINT8, INT8, FLOAT32]) # <<<<<<<<<<<<<< * assert_nchannels(src, [1]) * */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_48); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_50); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_50); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_3); - __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1); __Pyx_GIVEREF(__pyx_1); @@ -1768,25 +1303,25 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ __pyx_1 = 0; __pyx_2 = 0; __pyx_3 = 0; - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":175 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":115 * validate_array(src) * assert_dtype(src, [UINT8, INT8, FLOAT32]) * assert_nchannels(src, [1]) # <<<<<<<<<<<<<< * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 175; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_int_1); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1); __Pyx_GIVEREF(__pyx_int_1); - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 175; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":177 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":117 * assert_nchannels(src, [1]) * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): # <<<<<<<<<<<<<< @@ -1805,29 +1340,29 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ } if (__pyx_t_4) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":178 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":118 * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): * raise ValueError('aperture_size must be 3, 5, or 7') # <<<<<<<<<<<<<< * * if out is not None: */ - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); - __Pyx_INCREF(__pyx_kp_51); - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_51); - __Pyx_GIVEREF(__pyx_kp_51); - __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_INCREF(__pyx_kp_52); + PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_52); + __Pyx_GIVEREF(__pyx_kp_52); + __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __Pyx_Raise(__pyx_t_5, 0, 0); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L6; } __pyx_L6:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":180 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":120 * raise ValueError('aperture_size must be 3, 5, or 7') * * if out is not None: # <<<<<<<<<<<<<< @@ -1837,75 +1372,75 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ __pyx_t_4 = (((PyObject *)__pyx_v_out) != Py_None); if (__pyx_t_4) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":181 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":121 * * if out is not None: * validate_array(out) # <<<<<<<<<<<<<< * assert_not_sharing_data(src, out) * assert_same_shape(src, out) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":182 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":122 * if out is not None: * validate_array(out) * assert_not_sharing_data(src, out) # <<<<<<<<<<<<<< * assert_same_shape(src, out) * assert_nchannels(out, [1]) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_data(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 182; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_data(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":183 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":123 * validate_array(out) * assert_not_sharing_data(src, out) * assert_same_shape(src, out) # <<<<<<<<<<<<<< * assert_nchannels(out, [1]) * if src.dtype == UINT8 or src.dtype == INT8: */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 183; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 123; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":184 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":124 * assert_not_sharing_data(src, out) * assert_same_shape(src, out) * assert_nchannels(out, [1]) # <<<<<<<<<<<<<< * if src.dtype == UINT8 or src.dtype == INT8: * assert_dtype(out, [INT16]) */ - __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_5)); __Pyx_INCREF(__pyx_int_1); PyList_SET_ITEM(__pyx_t_5, 0, __pyx_int_1); __Pyx_GIVEREF(__pyx_int_1); - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":185 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":125 * assert_same_shape(src, out) * assert_nchannels(out, [1]) * if src.dtype == UINT8 or src.dtype == INT8: # <<<<<<<<<<<<<< * assert_dtype(out, [INT16]) * else: */ - __pyx_t_5 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_48); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_2 = PyObject_RichCompare(__pyx_t_5, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_RichCompare(__pyx_t_5, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; if (!__pyx_t_4) { - __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_50); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_50); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_t_5 = PyObject_RichCompare(__pyx_t_2, __pyx_2, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyObject_RichCompare(__pyx_t_2, __pyx_2, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_t_6 = __pyx_t_3; } else { @@ -1913,41 +1448,41 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ } if (__pyx_t_6) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":186 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":126 * assert_nchannels(out, [1]) * if src.dtype == UINT8 or src.dtype == INT8: * assert_dtype(out, [INT16]) # <<<<<<<<<<<<<< * else: * assert_dtype(out, [FLOAT32]) */ - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_52); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_53); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_3); - __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_5)); PyList_SET_ITEM(__pyx_t_5, 0, __pyx_3); __Pyx_GIVEREF(__pyx_3); __pyx_3 = 0; - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; goto __pyx_L8; } /*else*/ { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":188 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":128 * assert_dtype(out, [INT16]) * else: * assert_dtype(out, [FLOAT32]) # <<<<<<<<<<<<<< * else: * if src.dtype == UINT8 or src.dtype == INT8: */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 188; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 188; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_5)); PyList_SET_ITEM(__pyx_t_5, 0, __pyx_1); __Pyx_GIVEREF(__pyx_1); __pyx_1 = 0; - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 188; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; } __pyx_L8:; @@ -1955,33 +1490,33 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ } /*else*/ { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":190 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":130 * assert_dtype(out, [FLOAT32]) * else: * if src.dtype == UINT8 or src.dtype == INT8: # <<<<<<<<<<<<<< * out = new_array_like_diff_dtype(src, INT16) * else: */ - __pyx_t_5 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 190; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 130; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_48); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 190; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 130; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_t_2 = PyObject_RichCompare(__pyx_t_5, __pyx_2, Py_EQ); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 190; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_RichCompare(__pyx_t_5, __pyx_2, Py_EQ); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 130; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 190; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 130; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; if (!__pyx_t_6) { - __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 190; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 130; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_50); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 190; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_50); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 130; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_3); - __pyx_t_5 = PyObject_RichCompare(__pyx_t_2, __pyx_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 190; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyObject_RichCompare(__pyx_t_2, __pyx_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 130; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 190; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 130; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_t_3 = __pyx_t_4; } else { @@ -1989,16 +1524,16 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ } if (__pyx_t_3) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":191 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":131 * else: * if src.dtype == UINT8 or src.dtype == INT8: * out = new_array_like_diff_dtype(src, INT16) # <<<<<<<<<<<<<< * else: * out = new_array_like(src) */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_52); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_53); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __Pyx_DECREF(((PyObject *)__pyx_v_out)); @@ -2008,14 +1543,14 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ } /*else*/ { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":193 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":133 * out = new_array_like_diff_dtype(src, INT16) * else: * out = new_array_like(src) # <<<<<<<<<<<<<< * * cdef IplImage srcimg */ - __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 193; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(((PyObject *)__pyx_v_out)); __pyx_v_out = ((PyArrayObject *)__pyx_t_5); @@ -2025,7 +1560,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ } __pyx_L7:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":198 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":138 * cdef IplImage outimg * * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -2034,7 +1569,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":199 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":139 * * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -2043,7 +1578,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":201 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":141 * populate_iplimage(out, &outimg) * * c_cvSobel(&srcimg, &outimg, xorder, yorder, aperture_size) # <<<<<<<<<<<<<< @@ -2052,7 +1587,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ */ __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvSobel((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_xorder, __pyx_v_yorder, __pyx_v_aperture_size); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":203 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":143 * c_cvSobel(&srcimg, &outimg, xorder, yorder, aperture_size) * * return out # <<<<<<<<<<<<<< @@ -2081,7 +1616,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":205 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":145 * return out * * def cvLaplace(np.ndarray src, np.ndarray out=None, int aperture_size=3): # <<<<<<<<<<<<<< @@ -2138,12 +1673,12 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvLaplace") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 205; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvLaplace") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); __pyx_v_out = ((PyArrayObject *)values[1]); if (values[2]) { - __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 205; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_aperture_size = 3; } @@ -2151,7 +1686,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject __pyx_v_out = ((PyArrayObject *)Py_None); __pyx_v_aperture_size = 3; switch (PyTuple_GET_SIZE(__pyx_args)) { - case 3: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 205; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 3: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 2: __pyx_v_out = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1)); case 1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); break; @@ -2160,38 +1695,38 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvLaplace", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 205; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvLaplace", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvLaplace"); return NULL; __pyx_L4_argument_unpacking_done:; __Pyx_INCREF((PyObject *)__pyx_v_out); - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 205; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_out), __pyx_ptype_5numpy_ndarray, 1, "out", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 205; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_out), __pyx_ptype_5numpy_ndarray, 1, "out", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":213 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":153 * """ * * validate_array(src) # <<<<<<<<<<<<<< * assert_dtype(src, [UINT8, INT8, FLOAT32]) * assert_nchannels(src, [1]) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":214 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":154 * * validate_array(src) * assert_dtype(src, [UINT8, INT8, FLOAT32]) # <<<<<<<<<<<<<< * assert_nchannels(src, [1]) * */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_48); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 214; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_50); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 214; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_50); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 214; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_3); - __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 214; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1); __Pyx_GIVEREF(__pyx_1); @@ -2202,25 +1737,25 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject __pyx_1 = 0; __pyx_2 = 0; __pyx_3 = 0; - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 214; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":215 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":155 * validate_array(src) * assert_dtype(src, [UINT8, INT8, FLOAT32]) * assert_nchannels(src, [1]) # <<<<<<<<<<<<<< * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 215; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_int_1); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1); __Pyx_GIVEREF(__pyx_int_1); - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 215; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":217 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":157 * assert_nchannels(src, [1]) * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): # <<<<<<<<<<<<<< @@ -2239,29 +1774,29 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject } if (__pyx_t_4) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":218 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":158 * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): * raise ValueError('aperture_size must be 3, 5, or 7') # <<<<<<<<<<<<<< * * */ - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 218; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); - __Pyx_INCREF(__pyx_kp_53); - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_53); - __Pyx_GIVEREF(__pyx_kp_53); - __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 218; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_INCREF(__pyx_kp_54); + PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_54); + __Pyx_GIVEREF(__pyx_kp_54); + __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __Pyx_Raise(__pyx_t_5, 0, 0); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 218; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L6; } __pyx_L6:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":221 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":161 * * * if out is not None: # <<<<<<<<<<<<<< @@ -2271,75 +1806,75 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject __pyx_t_4 = (((PyObject *)__pyx_v_out) != Py_None); if (__pyx_t_4) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":222 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":162 * * if out is not None: * validate_array(out) # <<<<<<<<<<<<<< * assert_not_sharing_data(src, out) * assert_same_shape(src, out) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 222; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 162; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":223 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":163 * if out is not None: * validate_array(out) * assert_not_sharing_data(src, out) # <<<<<<<<<<<<<< * assert_same_shape(src, out) * assert_nchannels(out, [1]) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_data(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 223; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_data(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 163; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":224 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":164 * validate_array(out) * assert_not_sharing_data(src, out) * assert_same_shape(src, out) # <<<<<<<<<<<<<< * assert_nchannels(out, [1]) * if src.dtype == UINT8 or src.dtype == INT8: */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":225 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":165 * assert_not_sharing_data(src, out) * assert_same_shape(src, out) * assert_nchannels(out, [1]) # <<<<<<<<<<<<<< * if src.dtype == UINT8 or src.dtype == INT8: * assert_dtype(out, [INT16]) */ - __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 225; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_5)); __Pyx_INCREF(__pyx_int_1); PyList_SET_ITEM(__pyx_t_5, 0, __pyx_int_1); __Pyx_GIVEREF(__pyx_int_1); - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 225; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":226 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":166 * assert_same_shape(src, out) * assert_nchannels(out, [1]) * if src.dtype == UINT8 or src.dtype == INT8: # <<<<<<<<<<<<<< * assert_dtype(out, [INT16]) * else: */ - __pyx_t_5 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 226; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_48); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 226; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_2 = PyObject_RichCompare(__pyx_t_5, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 226; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_RichCompare(__pyx_t_5, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 226; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; if (!__pyx_t_4) { - __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 226; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_50); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 226; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_50); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_t_5 = PyObject_RichCompare(__pyx_t_2, __pyx_2, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 226; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyObject_RichCompare(__pyx_t_2, __pyx_2, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 226; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_t_6 = __pyx_t_3; } else { @@ -2347,41 +1882,41 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject } if (__pyx_t_6) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":227 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":167 * assert_nchannels(out, [1]) * if src.dtype == UINT8 or src.dtype == INT8: * assert_dtype(out, [INT16]) # <<<<<<<<<<<<<< * else: * assert_dtype(out, [FLOAT32]) */ - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_52); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 227; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_53); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_3); - __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 227; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_5)); PyList_SET_ITEM(__pyx_t_5, 0, __pyx_3); __Pyx_GIVEREF(__pyx_3); __pyx_3 = 0; - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 227; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; goto __pyx_L8; } /*else*/ { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":229 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":169 * assert_dtype(out, [INT16]) * else: * assert_dtype(out, [FLOAT32]) # <<<<<<<<<<<<<< * else: * if src.dtype == UINT8 or src.dtype == INT8: */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_5)); PyList_SET_ITEM(__pyx_t_5, 0, __pyx_1); __Pyx_GIVEREF(__pyx_1); __pyx_1 = 0; - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; } __pyx_L8:; @@ -2389,33 +1924,33 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject } /*else*/ { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":231 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":171 * assert_dtype(out, [FLOAT32]) * else: * if src.dtype == UINT8 or src.dtype == INT8: # <<<<<<<<<<<<<< * out = new_array_like_diff_dtype(src, INT16) * else: */ - __pyx_t_5 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 231; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_48); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 231; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_t_2 = PyObject_RichCompare(__pyx_t_5, __pyx_2, Py_EQ); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 231; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_RichCompare(__pyx_t_5, __pyx_2, Py_EQ); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 231; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; if (!__pyx_t_6) { - __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 231; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_50); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 231; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_50); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_3); - __pyx_t_5 = PyObject_RichCompare(__pyx_t_2, __pyx_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 231; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyObject_RichCompare(__pyx_t_2, __pyx_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 231; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_t_3 = __pyx_t_4; } else { @@ -2423,16 +1958,16 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject } if (__pyx_t_3) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":232 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":172 * else: * if src.dtype == UINT8 or src.dtype == INT8: * out = new_array_like_diff_dtype(src, INT16) # <<<<<<<<<<<<<< * else: * out = new_array_like(src) */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_52); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 232; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_53); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 232; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __Pyx_DECREF(((PyObject *)__pyx_v_out)); @@ -2442,14 +1977,14 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject } /*else*/ { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":234 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":174 * out = new_array_like_diff_dtype(src, INT16) * else: * out = new_array_like(src) # <<<<<<<<<<<<<< * * cdef IplImage srcimg */ - __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(((PyObject *)__pyx_v_out)); __pyx_v_out = ((PyArrayObject *)__pyx_t_5); @@ -2459,7 +1994,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject } __pyx_L7:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":239 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":179 * cdef IplImage outimg * * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -2468,7 +2003,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":240 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":180 * * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -2477,7 +2012,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":242 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":182 * populate_iplimage(out, &outimg) * * c_cvLaplace(&srcimg, &outimg, aperture_size) # <<<<<<<<<<<<<< @@ -2486,7 +2021,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject */ __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvLaplace((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_aperture_size); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":244 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":184 * c_cvLaplace(&srcimg, &outimg, aperture_size) * * return out # <<<<<<<<<<<<<< @@ -2515,7 +2050,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":246 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":186 * return out * * def cvCanny(np.ndarray src, np.ndarray out=None, double threshold1=10, # <<<<<<<<<<<<<< @@ -2582,22 +2117,22 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_ } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvCanny") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 246; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvCanny") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); __pyx_v_out = ((PyArrayObject *)values[1]); if (values[2]) { - __pyx_v_threshold1 = __pyx_PyFloat_AsDouble(values[2]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 246; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_threshold1 = __pyx_PyFloat_AsDouble(values[2]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_threshold1 = ((double)10); } if (values[3]) { - __pyx_v_threshold2 = __pyx_PyFloat_AsDouble(values[3]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_threshold2 = __pyx_PyFloat_AsDouble(values[3]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 187; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_threshold2 = ((double)50); } if (values[4]) { - __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[4]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[4]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 187; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_aperture_size = 3; } @@ -2607,9 +2142,9 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_ __pyx_v_threshold2 = ((double)50); __pyx_v_aperture_size = 3; switch (PyTuple_GET_SIZE(__pyx_args)) { - case 5: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 4)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - case 4: __pyx_v_threshold2 = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - case 3: __pyx_v_threshold1 = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 246; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 5: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 4)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 187; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 4: __pyx_v_threshold2 = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 187; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 3: __pyx_v_threshold1 = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 2: __pyx_v_out = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1)); case 1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); break; @@ -2618,40 +2153,40 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_ } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvCanny", 0, 1, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 246; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvCanny", 0, 1, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvCanny"); return NULL; __pyx_L4_argument_unpacking_done:; __Pyx_INCREF((PyObject *)__pyx_v_out); - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 246; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_out), __pyx_ptype_5numpy_ndarray, 1, "out", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 246; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_out), __pyx_ptype_5numpy_ndarray, 1, "out", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":255 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":195 * """ * * validate_array(src) # <<<<<<<<<<<<<< * assert_nchannels(src, [1]) * */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 195; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":256 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":196 * * validate_array(src) * assert_nchannels(src, [1]) # <<<<<<<<<<<<<< * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_int_1); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1); __Pyx_GIVEREF(__pyx_int_1); - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":258 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":198 * assert_nchannels(src, [1]) * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): # <<<<<<<<<<<<<< @@ -2670,29 +2205,29 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_ } if (__pyx_t_4) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":259 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":199 * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): * raise ValueError('aperture_size must be 3, 5, or 7') # <<<<<<<<<<<<<< * * */ - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 259; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 199; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); - __Pyx_INCREF(__pyx_kp_54); - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_54); - __Pyx_GIVEREF(__pyx_kp_54); - __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 259; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_INCREF(__pyx_kp_55); + PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_55); + __Pyx_GIVEREF(__pyx_kp_55); + __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 199; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __Pyx_Raise(__pyx_t_5, 0, 0); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 259; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 199; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L6; } __pyx_L6:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":262 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":202 * * * if out is not None: # <<<<<<<<<<<<<< @@ -2702,59 +2237,59 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_ __pyx_t_4 = (((PyObject *)__pyx_v_out) != Py_None); if (__pyx_t_4) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":263 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":203 * * if out is not None: * validate_array(out) # <<<<<<<<<<<<<< * assert_nchannels(out, [1]) * assert_same_shape(src, out) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 203; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":264 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":204 * if out is not None: * validate_array(out) * assert_nchannels(out, [1]) # <<<<<<<<<<<<<< * assert_same_shape(src, out) * assert_not_sharing_data(src, out) */ - __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 264; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 204; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_5)); __Pyx_INCREF(__pyx_int_1); PyList_SET_ITEM(__pyx_t_5, 0, __pyx_int_1); __Pyx_GIVEREF(__pyx_int_1); - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 264; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 204; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":265 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":205 * validate_array(out) * assert_nchannels(out, [1]) * assert_same_shape(src, out) # <<<<<<<<<<<<<< * assert_not_sharing_data(src, out) * else: */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 205; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":266 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":206 * assert_nchannels(out, [1]) * assert_same_shape(src, out) * assert_not_sharing_data(src, out) # <<<<<<<<<<<<<< * else: * out = new_array_like(src) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_data(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 266; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_data(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 206; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L7; } /*else*/ { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":268 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":208 * assert_not_sharing_data(src, out) * else: * out = new_array_like(src) # <<<<<<<<<<<<<< * * cdef IplImage srcimg */ - __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 268; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 208; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(((PyObject *)__pyx_v_out)); __pyx_v_out = ((PyArrayObject *)__pyx_t_5); @@ -2762,7 +2297,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_ } __pyx_L7:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":272 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":212 * cdef IplImage srcimg * cdef IplImage outimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -2771,7 +2306,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_ */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":273 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":213 * cdef IplImage outimg * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -2780,7 +2315,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_ */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":275 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":215 * populate_iplimage(out, &outimg) * * c_cvCanny(&srcimg, &outimg, threshold1, threshold2, aperture_size) # <<<<<<<<<<<<<< @@ -2789,7 +2324,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_ */ __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCanny((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_threshold1, __pyx_v_threshold2, __pyx_v_aperture_size); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":277 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":217 * c_cvCanny(&srcimg, &outimg, threshold1, threshold2, aperture_size) * * return out # <<<<<<<<<<<<<< @@ -2815,7 +2350,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_ return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":279 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":219 * return out * * def cvPreCornerDetect(np.ndarray src, np.ndarray out=None, # <<<<<<<<<<<<<< @@ -2870,12 +2405,12 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvPreCornerDetect") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 279; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvPreCornerDetect") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); __pyx_v_out = ((PyArrayObject *)values[1]); if (values[2]) { - __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 280; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_aperture_size = 3; } @@ -2883,7 +2418,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P __pyx_v_out = ((PyArrayObject *)Py_None); __pyx_v_aperture_size = 3; switch (PyTuple_GET_SIZE(__pyx_args)) { - case 3: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 280; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 3: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 2: __pyx_v_out = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1)); case 1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); break; @@ -2892,36 +2427,36 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvPreCornerDetect", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 279; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvPreCornerDetect", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvPreCornerDetect"); return NULL; __pyx_L4_argument_unpacking_done:; __Pyx_INCREF((PyObject *)__pyx_v_out); - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 279; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_out), __pyx_ptype_5numpy_ndarray, 1, "out", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 279; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_out), __pyx_ptype_5numpy_ndarray, 1, "out", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":287 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":227 * """ * * validate_array(src) # <<<<<<<<<<<<<< * assert_dtype(src, [UINT8, FLOAT32]) * assert_nchannels(src, [1]) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 287; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 227; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":288 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":228 * * validate_array(src) * assert_dtype(src, [UINT8, FLOAT32]) # <<<<<<<<<<<<<< * assert_nchannels(src, [1]) * */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_48); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 288; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 228; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 288; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 228; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 288; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 228; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1); __Pyx_GIVEREF(__pyx_1); @@ -2929,25 +2464,25 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P __Pyx_GIVEREF(__pyx_2); __pyx_1 = 0; __pyx_2 = 0; - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 288; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 228; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":289 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":229 * validate_array(src) * assert_dtype(src, [UINT8, FLOAT32]) * assert_nchannels(src, [1]) # <<<<<<<<<<<<<< * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 289; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_int_1); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1); __Pyx_GIVEREF(__pyx_int_1); - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 289; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":291 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":231 * assert_nchannels(src, [1]) * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): # <<<<<<<<<<<<<< @@ -2966,29 +2501,29 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P } if (__pyx_t_4) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":292 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":232 * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): * raise ValueError('aperture_size must be 3, 5, or 7') # <<<<<<<<<<<<<< * * if out is not None: */ - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 292; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 232; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); - __Pyx_INCREF(__pyx_kp_55); - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_55); - __Pyx_GIVEREF(__pyx_kp_55); - __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 292; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_INCREF(__pyx_kp_56); + PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_56); + __Pyx_GIVEREF(__pyx_kp_56); + __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 232; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __Pyx_Raise(__pyx_t_5, 0, 0); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 292; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 232; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L6; } __pyx_L6:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":294 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":234 * raise ValueError('aperture_size must be 3, 5, or 7') * * if out is not None: # <<<<<<<<<<<<<< @@ -2998,63 +2533,63 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P __pyx_t_4 = (((PyObject *)__pyx_v_out) != Py_None); if (__pyx_t_4) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":295 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":235 * * if out is not None: * validate_array(out) # <<<<<<<<<<<<<< * assert_same_shape(src, out) * assert_dtype(out, [FLOAT32]) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 235; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":296 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":236 * if out is not None: * validate_array(out) * assert_same_shape(src, out) # <<<<<<<<<<<<<< * assert_dtype(out, [FLOAT32]) * assert_not_sharing_data(src, out) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 296; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 236; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":297 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":237 * validate_array(out) * assert_same_shape(src, out) * assert_dtype(out, [FLOAT32]) # <<<<<<<<<<<<<< * assert_not_sharing_data(src, out) * else: */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 297; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 237; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 297; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 237; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_5)); PyList_SET_ITEM(__pyx_t_5, 0, __pyx_1); __Pyx_GIVEREF(__pyx_1); __pyx_1 = 0; - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 297; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 237; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":298 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":238 * assert_same_shape(src, out) * assert_dtype(out, [FLOAT32]) * assert_not_sharing_data(src, out) # <<<<<<<<<<<<<< * else: * out = new_array_like_diff_dtype(src, FLOAT32) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_data(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 298; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_data(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 238; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L7; } /*else*/ { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":300 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":240 * assert_not_sharing_data(src, out) * else: * out = new_array_like_diff_dtype(src, FLOAT32) # <<<<<<<<<<<<<< * * cdef IplImage srcimg */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 300; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 240; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_2)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 300; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_2)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 240; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_DECREF(((PyObject *)__pyx_v_out)); @@ -3063,7 +2598,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P } __pyx_L7:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":304 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":244 * cdef IplImage srcimg * cdef IplImage outimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -3072,7 +2607,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":305 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":245 * cdef IplImage outimg * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -3081,7 +2616,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":307 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":247 * populate_iplimage(out, &outimg) * * c_cvPreCornerDetect(&srcimg, &outimg, aperture_size) # <<<<<<<<<<<<<< @@ -3090,7 +2625,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P */ __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvPreCornerDetect((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_aperture_size); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":309 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":249 * c_cvPreCornerDetect(&srcimg, &outimg, aperture_size) * * return out # <<<<<<<<<<<<<< @@ -3118,7 +2653,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":311 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":251 * return out * * def cvCornerEigenValsAndVecs(np.ndarray src, int block_size=3, # <<<<<<<<<<<<<< @@ -3175,16 +2710,16 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvCornerEigenValsAndVecs") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 311; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvCornerEigenValsAndVecs") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); if (values[1]) { - __pyx_v_block_size = __Pyx_PyInt_AsInt(values[1]); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 311; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_block_size = __Pyx_PyInt_AsInt(values[1]); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_block_size = 3; } if (values[2]) { - __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 312; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 252; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_aperture_size = 3; } @@ -3192,8 +2727,8 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn __pyx_v_block_size = 3; __pyx_v_aperture_size = 3; switch (PyTuple_GET_SIZE(__pyx_args)) { - case 3: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 312; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - case 2: __pyx_v_block_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 311; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 3: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 252; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 2: __pyx_v_block_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); break; default: goto __pyx_L5_argtuple_error; @@ -3201,50 +2736,50 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvCornerEigenValsAndVecs", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 311; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvCornerEigenValsAndVecs", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvCornerEigenValsAndVecs"); return NULL; __pyx_L4_argument_unpacking_done:; __pyx_v_out = Py_None; __Pyx_INCREF(Py_None); - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 311; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":324 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":264 * # given source array * * validate_array(src) # <<<<<<<<<<<<<< * assert_nchannels(src, [1]) * assert_dtype(src, [UINT8, FLOAT32]) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 324; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 264; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":325 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":265 * * validate_array(src) * assert_nchannels(src, [1]) # <<<<<<<<<<<<<< * assert_dtype(src, [UINT8, FLOAT32]) * */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_int_1); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1); __Pyx_GIVEREF(__pyx_int_1); - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":326 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":266 * validate_array(src) * assert_nchannels(src, [1]) * assert_dtype(src, [UINT8, FLOAT32]) # <<<<<<<<<<<<<< * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_48); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 266; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 266; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 266; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1); __Pyx_GIVEREF(__pyx_1); @@ -3252,10 +2787,10 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn __Pyx_GIVEREF(__pyx_2); __pyx_1 = 0; __pyx_2 = 0; - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 266; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":328 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":268 * assert_dtype(src, [UINT8, FLOAT32]) * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): # <<<<<<<<<<<<<< @@ -3274,29 +2809,29 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn } if (__pyx_t_4) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":329 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":269 * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): * raise ValueError('aperture_size must be 3, 5, or 7') # <<<<<<<<<<<<<< * * cdef np.npy_intp outshape[2] */ - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 329; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 269; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); - __Pyx_INCREF(__pyx_kp_56); - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_56); - __Pyx_GIVEREF(__pyx_kp_56); - __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 329; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_INCREF(__pyx_kp_57); + PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_57); + __Pyx_GIVEREF(__pyx_kp_57); + __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 269; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __Pyx_Raise(__pyx_t_5, 0, 0); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 329; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 269; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L6; } __pyx_L6:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":332 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":272 * * cdef np.npy_intp outshape[2] * outshape[0] = src.shape[0] # <<<<<<<<<<<<<< @@ -3305,7 +2840,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn */ (__pyx_v_outshape[0]) = (__pyx_v_src->dimensions[0]); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":333 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":273 * cdef np.npy_intp outshape[2] * outshape[0] = src.shape[0] * outshape[1] = src.shape[1] * 6 # <<<<<<<<<<<<<< @@ -3314,23 +2849,23 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn */ (__pyx_v_outshape[1]) = ((__pyx_v_src->dimensions[1]) * ((npy_intp)6)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":335 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":275 * outshape[1] = src.shape[1] * 6 * * out = new_array(2, outshape, FLOAT32) # <<<<<<<<<<<<<< * * cdef IplImage srcimg */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(2, __pyx_v_outshape, __pyx_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(2, __pyx_v_outshape, __pyx_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __Pyx_DECREF(__pyx_v_out); __pyx_v_out = __pyx_t_5; __pyx_t_5 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":339 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":279 * cdef IplImage srcimg * cdef IplImage outimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -3339,17 +2874,17 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":340 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":280 * cdef IplImage outimg * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< * * c_cvCornerEigenValsAndVecs(&srcimg, &outimg, block_size, aperture_size) */ - if (!(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 340; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 280; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(((PyArrayObject *)__pyx_v_out), (&__pyx_v_outimg)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":342 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":282 * populate_iplimage(out, &outimg) * * c_cvCornerEigenValsAndVecs(&srcimg, &outimg, block_size, aperture_size) # <<<<<<<<<<<<<< @@ -3358,7 +2893,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn */ __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCornerEigenValsAndVecs((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_block_size, __pyx_v_aperture_size); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":344 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":284 * c_cvCornerEigenValsAndVecs(&srcimg, &outimg, block_size, aperture_size) * * return out.reshape(out.shape[0], -1, 6) # <<<<<<<<<<<<<< @@ -3366,14 +2901,14 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn * def cvCornerMinEigenVal(np.ndarray src, int block_size=3, */ __Pyx_XDECREF(__pyx_r); - __pyx_t_5 = PyObject_GetAttr(__pyx_v_out, __pyx_kp_reshape); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 344; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyObject_GetAttr(__pyx_v_out, __pyx_kp_reshape); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 284; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); - __pyx_t_2 = PyObject_GetAttr(__pyx_v_out, __pyx_kp_shape); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 344; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(__pyx_v_out, __pyx_kp_shape); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 284; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_2 = __Pyx_GetItemInt(__pyx_t_2, 0, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 344; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetItemInt(__pyx_t_2, 0, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 284; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyTuple_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 344; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyTuple_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 284; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_2); __Pyx_GIVEREF(__pyx_2); @@ -3384,7 +2919,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn PyTuple_SET_ITEM(__pyx_t_2, 2, __pyx_int_6); __Pyx_GIVEREF(__pyx_int_6); __pyx_2 = 0; - __pyx_t_6 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 344; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 284; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; @@ -3409,7 +2944,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":346 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":286 * return out.reshape(out.shape[0], -1, 6) * * def cvCornerMinEigenVal(np.ndarray src, int block_size=3, # <<<<<<<<<<<<<< @@ -3464,16 +2999,16 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenVal } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvCornerMinEigenVal") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 346; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvCornerMinEigenVal") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 286; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); if (values[1]) { - __pyx_v_block_size = __Pyx_PyInt_AsInt(values[1]); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 346; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_block_size = __Pyx_PyInt_AsInt(values[1]); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 286; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_block_size = 3; } if (values[2]) { - __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 347; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 287; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_aperture_size = 3; } @@ -3481,8 +3016,8 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenVal __pyx_v_block_size = 3; __pyx_v_aperture_size = 3; switch (PyTuple_GET_SIZE(__pyx_args)) { - case 3: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 347; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - case 2: __pyx_v_block_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 346; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 3: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 287; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 2: __pyx_v_block_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 286; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); break; default: goto __pyx_L5_argtuple_error; @@ -3490,50 +3025,50 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenVal } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvCornerMinEigenVal", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 346; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvCornerMinEigenVal", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 286; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvCornerMinEigenVal"); return NULL; __pyx_L4_argument_unpacking_done:; __pyx_v_out = Py_None; __Pyx_INCREF(Py_None); - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 346; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 286; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":357 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":297 * # given source array * * validate_array(src) # <<<<<<<<<<<<<< * assert_nchannels(src, [1]) * assert_dtype(src, [UINT8, FLOAT32]) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 357; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 297; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":358 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":298 * * validate_array(src) * assert_nchannels(src, [1]) # <<<<<<<<<<<<<< * assert_dtype(src, [UINT8, FLOAT32]) * */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 358; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 298; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_int_1); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1); __Pyx_GIVEREF(__pyx_int_1); - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 358; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 298; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":359 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":299 * validate_array(src) * assert_nchannels(src, [1]) * assert_dtype(src, [UINT8, FLOAT32]) # <<<<<<<<<<<<<< * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_48); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 359; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 299; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 359; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 299; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 359; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 299; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1); __Pyx_GIVEREF(__pyx_1); @@ -3541,10 +3076,10 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenVal __Pyx_GIVEREF(__pyx_2); __pyx_1 = 0; __pyx_2 = 0; - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 359; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 299; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":361 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":301 * assert_dtype(src, [UINT8, FLOAT32]) * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): # <<<<<<<<<<<<<< @@ -3563,45 +3098,45 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenVal } if (__pyx_t_4) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":362 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":302 * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): * raise ValueError('aperture_size must be 3, 5, or 7') # <<<<<<<<<<<<<< * * out = new_array_like_diff_dtype(src, FLOAT32) */ - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 362; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 302; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); - __Pyx_INCREF(__pyx_kp_57); - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_57); - __Pyx_GIVEREF(__pyx_kp_57); - __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 362; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_INCREF(__pyx_kp_58); + PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_58); + __Pyx_GIVEREF(__pyx_kp_58); + __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 302; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __Pyx_Raise(__pyx_t_5, 0, 0); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 362; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 302; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L6; } __pyx_L6:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":364 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":304 * raise ValueError('aperture_size must be 3, 5, or 7') * * out = new_array_like_diff_dtype(src, FLOAT32) # <<<<<<<<<<<<<< * * cdef IplImage srcimg */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 364; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 304; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 364; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 304; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __Pyx_DECREF(__pyx_v_out); __pyx_v_out = __pyx_t_5; __pyx_t_5 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":368 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":308 * cdef IplImage srcimg * cdef IplImage outimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -3610,17 +3145,17 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenVal */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":369 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":309 * cdef IplImage outimg * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< * * c_cvCornerMinEigenVal(&srcimg, &outimg, block_size, aperture_size) */ - if (!(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 369; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 309; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(((PyArrayObject *)__pyx_v_out), (&__pyx_v_outimg)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":371 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":311 * populate_iplimage(out, &outimg) * * c_cvCornerMinEigenVal(&srcimg, &outimg, block_size, aperture_size) # <<<<<<<<<<<<<< @@ -3629,7 +3164,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenVal */ __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCornerMinEigenVal((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_block_size, __pyx_v_aperture_size); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":373 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":313 * c_cvCornerMinEigenVal(&srcimg, &outimg, block_size, aperture_size) * * return out # <<<<<<<<<<<<<< @@ -3657,7 +3192,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenVal return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":375 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":315 * return out * * def cvCornerHarris(np.ndarray src, int block_size=3, int aperture_size=3, # <<<<<<<<<<<<<< @@ -3719,21 +3254,21 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerHarris(PyOb } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvCornerHarris") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 375; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvCornerHarris") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 315; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); if (values[1]) { - __pyx_v_block_size = __Pyx_PyInt_AsInt(values[1]); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 375; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_block_size = __Pyx_PyInt_AsInt(values[1]); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 315; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_block_size = 3; } if (values[2]) { - __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 375; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 315; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_aperture_size = 3; } if (values[3]) { - __pyx_v_k = __pyx_PyFloat_AsDouble(values[3]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 376; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_k = __pyx_PyFloat_AsDouble(values[3]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 316; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_k = 0.040000000000000001; } @@ -3742,9 +3277,9 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerHarris(PyOb __pyx_v_aperture_size = 3; __pyx_v_k = 0.040000000000000001; switch (PyTuple_GET_SIZE(__pyx_args)) { - case 4: __pyx_v_k = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 376; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - case 3: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 375; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - case 2: __pyx_v_block_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 375; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 4: __pyx_v_k = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 316; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 3: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 315; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 2: __pyx_v_block_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 315; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); break; default: goto __pyx_L5_argtuple_error; @@ -3752,50 +3287,50 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerHarris(PyOb } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvCornerHarris", 0, 1, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 375; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvCornerHarris", 0, 1, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 315; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvCornerHarris"); return NULL; __pyx_L4_argument_unpacking_done:; __pyx_v_out = Py_None; __Pyx_INCREF(Py_None); - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 375; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 315; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":386 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":326 * # given source array * * validate_array(src) # <<<<<<<<<<<<<< * assert_nchannels(src, [1]) * assert_dtype(src, [UINT8, FLOAT32]) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 386; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":387 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":327 * * validate_array(src) * assert_nchannels(src, [1]) # <<<<<<<<<<<<<< * assert_dtype(src, [UINT8, FLOAT32]) * */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 387; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 327; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_int_1); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1); __Pyx_GIVEREF(__pyx_int_1); - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 387; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 327; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":388 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":328 * validate_array(src) * assert_nchannels(src, [1]) * assert_dtype(src, [UINT8, FLOAT32]) # <<<<<<<<<<<<<< * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_48); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 388; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 328; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 388; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 328; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 388; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 328; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1); __Pyx_GIVEREF(__pyx_1); @@ -3803,10 +3338,10 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerHarris(PyOb __Pyx_GIVEREF(__pyx_2); __pyx_1 = 0; __pyx_2 = 0; - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 388; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 328; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":390 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":330 * assert_dtype(src, [UINT8, FLOAT32]) * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): # <<<<<<<<<<<<<< @@ -3825,45 +3360,45 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerHarris(PyOb } if (__pyx_t_4) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":391 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":331 * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): * raise ValueError('aperture_size must be 3, 5, or 7') # <<<<<<<<<<<<<< * * out = new_array_like_diff_dtype(src, FLOAT32) */ - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 391; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 331; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); - __Pyx_INCREF(__pyx_kp_58); - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_58); - __Pyx_GIVEREF(__pyx_kp_58); - __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 391; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_INCREF(__pyx_kp_59); + PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_59); + __Pyx_GIVEREF(__pyx_kp_59); + __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 331; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __Pyx_Raise(__pyx_t_5, 0, 0); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 391; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 331; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L6; } __pyx_L6:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":393 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":333 * raise ValueError('aperture_size must be 3, 5, or 7') * * out = new_array_like_diff_dtype(src, FLOAT32) # <<<<<<<<<<<<<< * * cdef IplImage srcimg */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 393; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 333; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 393; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 333; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __Pyx_DECREF(__pyx_v_out); __pyx_v_out = __pyx_t_5; __pyx_t_5 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":397 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":337 * cdef IplImage srcimg * cdef IplImage outimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -3872,17 +3407,17 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerHarris(PyOb */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":398 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":338 * cdef IplImage outimg * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< * * c_cvCornerHarris(&srcimg, &outimg, block_size, aperture_size, k) */ - if (!(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 398; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 338; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(((PyArrayObject *)__pyx_v_out), (&__pyx_v_outimg)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":400 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":340 * populate_iplimage(out, &outimg) * * c_cvCornerHarris(&srcimg, &outimg, block_size, aperture_size, k) # <<<<<<<<<<<<<< @@ -3891,7 +3426,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerHarris(PyOb */ __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCornerHarris((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_block_size, __pyx_v_aperture_size, __pyx_v_k); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":402 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":342 * c_cvCornerHarris(&srcimg, &outimg, block_size, aperture_size, k) * * return out # <<<<<<<<<<<<<< @@ -3919,7 +3454,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerHarris(PyOb return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":404 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":344 * return out * * def cvFindCornerSubPix(np.ndarray src, np.ndarray corners, int count, win, # <<<<<<<<<<<<<< @@ -3955,7 +3490,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix( if (unlikely(__pyx_kwds)) { Py_ssize_t kw_args = PyDict_Size(__pyx_kwds); PyObject* values[7] = {0,0,0,0,0,0,0}; - values[4] = __pyx_k_44; + values[4] = __pyx_k_42; switch (PyTuple_GET_SIZE(__pyx_args)) { case 7: values[6] = PyTuple_GET_ITEM(__pyx_args, 6); case 6: values[5] = PyTuple_GET_ITEM(__pyx_args, 5); @@ -3976,19 +3511,19 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix( values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_corners); if (likely(values[1])) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("cvFindCornerSubPix", 0, 4, 7, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 404; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvFindCornerSubPix", 0, 4, 7, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 344; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 2: values[2] = PyDict_GetItem(__pyx_kwds, __pyx_kp_count); if (likely(values[2])) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("cvFindCornerSubPix", 0, 4, 7, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 404; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvFindCornerSubPix", 0, 4, 7, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 344; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 3: values[3] = PyDict_GetItem(__pyx_kwds, __pyx_kp_win); if (likely(values[3])) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("cvFindCornerSubPix", 0, 4, 7, 3); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 404; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvFindCornerSubPix", 0, 4, 7, 3); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 344; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 4: if (kw_args > 0) { @@ -4007,37 +3542,37 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix( } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvFindCornerSubPix") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 404; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvFindCornerSubPix") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 344; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); __pyx_v_corners = ((PyArrayObject *)values[1]); - __pyx_v_count = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_count == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 404; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_count = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_count == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 344; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_v_win = values[3]; __pyx_v_zero_zone = values[4]; if (values[5]) { - __pyx_v_iterations = __Pyx_PyInt_AsInt(values[5]); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 405; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_iterations = __Pyx_PyInt_AsInt(values[5]); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 345; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_iterations = 0; } if (values[6]) { - __pyx_v_epsilon = __pyx_PyFloat_AsDouble(values[6]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 406; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_epsilon = __pyx_PyFloat_AsDouble(values[6]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 346; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_epsilon = 1.0000000000000001e-05; } } else { - __pyx_v_zero_zone = __pyx_k_44; + __pyx_v_zero_zone = __pyx_k_42; __pyx_v_iterations = 0; __pyx_v_epsilon = 1.0000000000000001e-05; switch (PyTuple_GET_SIZE(__pyx_args)) { case 7: - __pyx_v_epsilon = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 6)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 406; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_epsilon = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 6)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 346; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 6: - __pyx_v_iterations = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 5)); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 405; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_iterations = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 5)); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 345; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 5: __pyx_v_zero_zone = PyTuple_GET_ITEM(__pyx_args, 4); case 4: __pyx_v_win = PyTuple_GET_ITEM(__pyx_args, 3); - __pyx_v_count = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_count == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 404; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_count = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_count == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 344; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_v_corners = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1)); __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); break; @@ -4046,97 +3581,97 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix( } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvFindCornerSubPix", 0, 4, 7, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 404; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvFindCornerSubPix", 0, 4, 7, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 344; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvFindCornerSubPix"); return NULL; __pyx_L4_argument_unpacking_done:; - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 404; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_corners), __pyx_ptype_5numpy_ndarray, 1, "corners", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 404; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 344; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_corners), __pyx_ptype_5numpy_ndarray, 1, "corners", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 344; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":414 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":354 * """ * * validate_array(src) # <<<<<<<<<<<<<< * validate_array(corners) * */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 414; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 354; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":415 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":355 * * validate_array(src) * validate_array(corners) # <<<<<<<<<<<<<< * * assert_nchannels(src, [1]) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_corners); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 415; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_corners); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":417 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":357 * validate_array(corners) * * assert_nchannels(src, [1]) # <<<<<<<<<<<<<< * assert_dtype(src, [UINT8]) * */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 417; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 357; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_int_1); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1); __Pyx_GIVEREF(__pyx_int_1); - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 417; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 357; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":418 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":358 * * assert_nchannels(src, [1]) * assert_dtype(src, [UINT8]) # <<<<<<<<<<<<<< * * assert_nchannels(corners, [1]) */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_48); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 418; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 358; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 418; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 358; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1); __Pyx_GIVEREF(__pyx_1); __pyx_1 = 0; - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 418; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 358; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":420 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":360 * assert_dtype(src, [UINT8]) * * assert_nchannels(corners, [1]) # <<<<<<<<<<<<<< * assert_dtype(corners, [FLOAT32]) * */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 360; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_int_1); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1); __Pyx_GIVEREF(__pyx_int_1); - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_corners, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_corners, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 360; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":421 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":361 * * assert_nchannels(corners, [1]) * assert_dtype(corners, [FLOAT32]) # <<<<<<<<<<<<<< * * # make sure the number of points */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 421; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 361; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 421; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 361; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1); __Pyx_GIVEREF(__pyx_1); __pyx_1 = 0; - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_corners, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 421; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_corners, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 361; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":429 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":369 * # flat anyway, but regardless, the validate_array function ensures * # that it is 2D * cdef int nbytes = get_array_nbytes(corners) # <<<<<<<<<<<<<< @@ -4145,7 +3680,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix( */ __pyx_v_nbytes = ((int)__pyx_f_7scikits_5image_6opencv_14opencv_backend_get_array_nbytes(__pyx_v_corners)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":430 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":370 * # that it is 2D * cdef int nbytes = get_array_nbytes(corners) * if nbytes != (count * 2 * 4): # <<<<<<<<<<<<<< @@ -4155,29 +3690,29 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix( __pyx_t_3 = (__pyx_v_nbytes != ((__pyx_v_count * 2) * 4)); if (__pyx_t_3) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":431 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":371 * cdef int nbytes = get_array_nbytes(corners) * if nbytes != (count * 2 * 4): * raise ValueError('The number of declared points is different ' # <<<<<<<<<<<<<< * 'than exists in the array.') * cdef CvPoint2D32f* cvcorners = array_as_cvPoint2D32f_ptr(corners) */ - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 431; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 371; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); - __Pyx_INCREF(__pyx_kp_59); - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_59); - __Pyx_GIVEREF(__pyx_kp_59); - __pyx_t_4 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 431; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_INCREF(__pyx_kp_60); + PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_60); + __Pyx_GIVEREF(__pyx_kp_60); + __pyx_t_4 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 371; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __Pyx_Raise(__pyx_t_4, 0, 0); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 431; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 371; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L6; } __pyx_L6:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":433 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":373 * raise ValueError('The number of declared points is different ' * 'than exists in the array.') * cdef CvPoint2D32f* cvcorners = array_as_cvPoint2D32f_ptr(corners) # <<<<<<<<<<<<<< @@ -4186,59 +3721,59 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix( */ __pyx_v_cvcorners = __pyx_f_7scikits_5image_6opencv_14opencv_backend_array_as_cvPoint2D32f_ptr(__pyx_v_corners); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":436 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":376 * * cdef CvSize cvwin * cvwin.height = win[0] # <<<<<<<<<<<<<< * cvwin.width = win[1] * */ - __pyx_1 = __Pyx_GetItemInt(__pyx_v_win, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 436; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_win, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 376; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 436; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 376; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_v_cvwin.height = ((int)__pyx_t_1); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":437 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":377 * cdef CvSize cvwin * cvwin.height = win[0] * cvwin.width = win[1] # <<<<<<<<<<<<<< * * cdef CvSize cvzerozone */ - __pyx_1 = __Pyx_GetItemInt(__pyx_v_win, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 437; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_win, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 377; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 437; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 377; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_v_cvwin.width = ((int)__pyx_t_1); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":440 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":380 * * cdef CvSize cvzerozone * cvzerozone.height = zero_zone[0] # <<<<<<<<<<<<<< * cvzerozone.width = zero_zone[1] * */ - __pyx_1 = __Pyx_GetItemInt(__pyx_v_zero_zone, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 440; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_zero_zone, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 380; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 440; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 380; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_v_cvzerozone.height = ((int)__pyx_t_1); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":441 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":381 * cdef CvSize cvzerozone * cvzerozone.height = zero_zone[0] * cvzerozone.width = zero_zone[1] # <<<<<<<<<<<<<< * * cdef IplImage srcimg */ - __pyx_1 = __Pyx_GetItemInt(__pyx_v_zero_zone, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 441; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_zero_zone, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 381; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 441; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 381; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_v_cvzerozone.width = ((int)__pyx_t_1); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":444 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":384 * * cdef IplImage srcimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -4247,7 +3782,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix( */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":447 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":387 * * cdef CvTermCriteria crit * crit = get_cvTermCriteria(iterations, epsilon) # <<<<<<<<<<<<<< @@ -4256,7 +3791,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix( */ __pyx_v_crit = __pyx_f_7scikits_5image_6opencv_14opencv_backend_get_cvTermCriteria(__pyx_v_iterations, __pyx_v_epsilon); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":449 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":389 * crit = get_cvTermCriteria(iterations, epsilon) * * c_cvFindCornerSubPix(&srcimg, cvcorners, count, cvwin, cvzerozone, crit) # <<<<<<<<<<<<<< @@ -4265,7 +3800,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix( */ __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvFindCornerSubPix((&__pyx_v_srcimg), __pyx_v_cvcorners, __pyx_v_count, __pyx_v_cvwin, __pyx_v_cvzerozone, __pyx_v_crit); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":451 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":391 * c_cvFindCornerSubPix(&srcimg, cvcorners, count, cvwin, cvzerozone, crit) * * return None # <<<<<<<<<<<<<< @@ -4291,7 +3826,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix( return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":453 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":393 * return None * * def cvSmooth(np.ndarray src, np.ndarray out=None, # <<<<<<<<<<<<<< @@ -4329,7 +3864,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * Py_ssize_t kw_args = PyDict_Size(__pyx_kwds); PyObject* values[8] = {0,0,0,0,0,0,0,0}; values[1] = (PyObject*)((PyArrayObject *)Py_None); - values[7] = (PyObject*)__pyx_k_46; + values[7] = (PyObject*)__pyx_k_44; switch (PyTuple_GET_SIZE(__pyx_args)) { case 8: values[7] = PyTuple_GET_ITEM(__pyx_args, 7); case 7: values[6] = PyTuple_GET_ITEM(__pyx_args, 6); @@ -4384,51 +3919,51 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvSmooth") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 453; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvSmooth") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 393; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); __pyx_v_out = ((PyArrayObject *)values[1]); if (values[2]) { - __pyx_v_smoothtype = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_smoothtype == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 454; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_smoothtype = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_smoothtype == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 394; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { - __pyx_v_smoothtype = __pyx_k_45; + __pyx_v_smoothtype = __pyx_k_43; } if (values[3]) { - __pyx_v_param1 = __Pyx_PyInt_AsInt(values[3]); if (unlikely((__pyx_v_param1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 454; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_param1 = __Pyx_PyInt_AsInt(values[3]); if (unlikely((__pyx_v_param1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 394; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_param1 = 3; } if (values[4]) { - __pyx_v_param2 = __Pyx_PyInt_AsInt(values[4]); if (unlikely((__pyx_v_param2 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 455; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_param2 = __Pyx_PyInt_AsInt(values[4]); if (unlikely((__pyx_v_param2 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 395; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_param2 = 0; } if (values[5]) { - __pyx_v_param3 = __pyx_PyFloat_AsDouble(values[5]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 455; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_param3 = __pyx_PyFloat_AsDouble(values[5]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 395; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_param3 = ((double)0); } if (values[6]) { - __pyx_v_param4 = __pyx_PyFloat_AsDouble(values[6]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 455; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_param4 = __pyx_PyFloat_AsDouble(values[6]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 395; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_param4 = ((double)0); } __pyx_v_in_place = ((PyObject *)values[7]); } else { __pyx_v_out = ((PyArrayObject *)Py_None); - __pyx_v_smoothtype = __pyx_k_45; + __pyx_v_smoothtype = __pyx_k_43; __pyx_v_param1 = 3; __pyx_v_param2 = 0; __pyx_v_param3 = ((double)0); __pyx_v_param4 = ((double)0); - __pyx_v_in_place = __pyx_k_46; + __pyx_v_in_place = __pyx_k_44; switch (PyTuple_GET_SIZE(__pyx_args)) { case 8: __pyx_v_in_place = ((PyObject *)PyTuple_GET_ITEM(__pyx_args, 7)); - case 7: __pyx_v_param4 = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 6)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 455; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - case 6: __pyx_v_param3 = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 5)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 455; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - case 5: __pyx_v_param2 = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 4)); if (unlikely((__pyx_v_param2 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 455; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - case 4: __pyx_v_param1 = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely((__pyx_v_param1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 454; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - case 3: __pyx_v_smoothtype = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_smoothtype == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 454; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 7: __pyx_v_param4 = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 6)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 395; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 6: __pyx_v_param3 = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 5)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 395; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 5: __pyx_v_param2 = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 4)); if (unlikely((__pyx_v_param2 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 395; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 4: __pyx_v_param1 = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely((__pyx_v_param1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 394; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 3: __pyx_v_smoothtype = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_smoothtype == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 394; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 2: __pyx_v_out = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1)); case 1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); break; @@ -4437,26 +3972,26 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvSmooth", 0, 1, 8, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 453; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvSmooth", 0, 1, 8, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 393; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvSmooth"); return NULL; __pyx_L4_argument_unpacking_done:; __Pyx_INCREF((PyObject *)__pyx_v_out); - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 453; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_out), __pyx_ptype_5numpy_ndarray, 1, "out", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 453; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_in_place), &PyBool_Type, 1, "in_place", 1))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 456; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 393; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_out), __pyx_ptype_5numpy_ndarray, 1, "out", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 393; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_in_place), &PyBool_Type, 1, "in_place", 1))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 396; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":463 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":403 * """ * * validate_array(src) # <<<<<<<<<<<<<< * if out is not None: * validate_array(out) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 463; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 403; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":464 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":404 * * validate_array(src) * if out is not None: # <<<<<<<<<<<<<< @@ -4466,83 +4001,83 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * __pyx_t_2 = (((PyObject *)__pyx_v_out) != Py_None); if (__pyx_t_2) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":465 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":405 * validate_array(src) * if out is not None: * validate_array(out) # <<<<<<<<<<<<<< * * # there are restrictions that must be placed on the data depending on */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 465; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 405; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L6; } __pyx_L6:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":471 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":411 * * # CV_BLUR_NO_SCALE * if smoothtype == CV_BLUR_NO_SCALE: # <<<<<<<<<<<<<< * * if in_place: */ - __pyx_t_3 = PyInt_FromLong(__pyx_v_smoothtype); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 471; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyInt_FromLong(__pyx_v_smoothtype); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 411; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_BLUR_NO_SCALE); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 471; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_BLUR_NO_SCALE); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 411; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 471; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 411; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 471; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 411; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; if (__pyx_t_2) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":473 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":413 * if smoothtype == CV_BLUR_NO_SCALE: * * if in_place: # <<<<<<<<<<<<<< * raise RuntimeError('In place operation not supported with this ' * 'filter') */ - __pyx_t_2 = __Pyx_PyObject_IsTrue(((PyObject *)__pyx_v_in_place)); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 473; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_IsTrue(((PyObject *)__pyx_v_in_place)); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 413; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (__pyx_t_2) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":474 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":414 * * if in_place: * raise RuntimeError('In place operation not supported with this ' # <<<<<<<<<<<<<< * 'filter') * */ - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 474; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 414; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_4)); - __Pyx_INCREF(__pyx_kp_60); - PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_kp_60); - __Pyx_GIVEREF(__pyx_kp_60); - __pyx_t_3 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 474; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_INCREF(__pyx_kp_61); + PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_kp_61); + __Pyx_GIVEREF(__pyx_kp_61); + __pyx_t_3 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 414; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; __Pyx_Raise(__pyx_t_3, 0, 0); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 474; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 414; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L8; } __pyx_L8:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":477 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":417 * 'filter') * * assert_dtype(src, [UINT8, INT8, FLOAT32]) # <<<<<<<<<<<<<< * assert_ndims(src, [2]) * */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_48); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 477; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 417; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_50); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 477; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_50); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 417; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 477; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 417; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_3); - __pyx_t_3 = PyList_New(3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 477; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyList_New(3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 417; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_3)); PyList_SET_ITEM(__pyx_t_3, 0, __pyx_1); __Pyx_GIVEREF(__pyx_1); @@ -4553,25 +4088,25 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * __pyx_1 = 0; __pyx_2 = 0; __pyx_3 = 0; - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 477; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 417; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":478 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":418 * * assert_dtype(src, [UINT8, INT8, FLOAT32]) * assert_ndims(src, [2]) # <<<<<<<<<<<<<< * * if out is not None: */ - __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 478; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 418; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_int_2); PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_2); __Pyx_GIVEREF(__pyx_int_2); - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(__pyx_v_src, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 478; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(__pyx_v_src, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 418; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":480 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":420 * assert_ndims(src, [2]) * * if out is not None: # <<<<<<<<<<<<<< @@ -4581,103 +4116,103 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * __pyx_t_2 = (((PyObject *)__pyx_v_out) != Py_None); if (__pyx_t_2) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":481 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":421 * * if out is not None: * if src.dtype == FLOAT32: # <<<<<<<<<<<<<< * assert_dtype(out, [FLOAT32]) * else: */ - __pyx_t_3 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 481; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 421; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 481; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 421; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 481; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 421; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 481; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 421; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; if (__pyx_t_2) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":482 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":422 * if out is not None: * if src.dtype == FLOAT32: * assert_dtype(out, [FLOAT32]) # <<<<<<<<<<<<<< * else: * assert_dtype(out, [INT16]) */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 482; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 422; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 482; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 422; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_4)); PyList_SET_ITEM(__pyx_t_4, 0, __pyx_2); __Pyx_GIVEREF(__pyx_2); __pyx_2 = 0; - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_4)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 482; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_4)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 422; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; goto __pyx_L10; } /*else*/ { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":484 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":424 * assert_dtype(out, [FLOAT32]) * else: * assert_dtype(out, [INT16]) # <<<<<<<<<<<<<< * assert_same_shape(src, out) * else: */ - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_52); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 484; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_53); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 424; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_3); - __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 484; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 424; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_4)); PyList_SET_ITEM(__pyx_t_4, 0, __pyx_3); __Pyx_GIVEREF(__pyx_3); __pyx_3 = 0; - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_4)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 484; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_4)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 424; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; } __pyx_L10:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":485 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":425 * else: * assert_dtype(out, [INT16]) * assert_same_shape(src, out) # <<<<<<<<<<<<<< * else: * if src.dtype == FLOAT32: */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 485; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 425; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L9; } /*else*/ { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":487 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":427 * assert_same_shape(src, out) * else: * if src.dtype == FLOAT32: # <<<<<<<<<<<<<< * out = new_array_like(src) * else: */ - __pyx_t_4 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 487; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 427; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 487; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 427; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_3 = PyObject_RichCompare(__pyx_t_4, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 487; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_RichCompare(__pyx_t_4, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 427; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 487; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 427; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; if (__pyx_t_2) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":488 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":428 * else: * if src.dtype == FLOAT32: * out = new_array_like(src) # <<<<<<<<<<<<<< * else: * out = new_array_like_diff_dtype(src, INT16) */ - __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 488; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(((PyObject *)__pyx_v_out)); __pyx_v_out = ((PyArrayObject *)__pyx_t_3); @@ -4686,16 +4221,16 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * } /*else*/ { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":490 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":430 * out = new_array_like(src) * else: * out = new_array_like_diff_dtype(src, INT16) # <<<<<<<<<<<<<< * * # CV_BLUR and CV_GAUSSIAN */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_52); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 490; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_53); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 430; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_2)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 490; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_2)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 430; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_DECREF(((PyObject *)__pyx_v_out)); @@ -4708,33 +4243,33 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * goto __pyx_L7; } - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":493 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":433 * * # CV_BLUR and CV_GAUSSIAN * elif smoothtype == CV_BLUR or smoothtype == CV_GAUSSIAN: # <<<<<<<<<<<<<< * * assert_dtype(src, [UINT8, INT8, FLOAT32]) */ - __pyx_t_3 = PyInt_FromLong(__pyx_v_smoothtype); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 493; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyInt_FromLong(__pyx_v_smoothtype); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 433; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_BLUR); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 493; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_BLUR); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 433; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_3); - __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, __pyx_3, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 493; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, __pyx_3, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 433; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 493; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 433; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; if (!__pyx_t_2) { - __pyx_t_4 = PyInt_FromLong(__pyx_v_smoothtype); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 493; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyInt_FromLong(__pyx_v_smoothtype); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 433; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_GAUSSIAN); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 493; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_GAUSSIAN); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 433; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_3 = PyObject_RichCompare(__pyx_t_4, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 493; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_RichCompare(__pyx_t_4, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 433; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 493; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 433; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_t_6 = __pyx_t_5; } else { @@ -4742,20 +4277,20 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * } if (__pyx_t_6) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":495 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":435 * elif smoothtype == CV_BLUR or smoothtype == CV_GAUSSIAN: * * assert_dtype(src, [UINT8, INT8, FLOAT32]) # <<<<<<<<<<<<<< * assert_nchannels(src, [1, 3]) * */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_48); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 495; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 435; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_50); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 495; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_50); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 435; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_3); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 495; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 435; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_3 = PyList_New(3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 495; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyList_New(3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 435; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_3)); PyList_SET_ITEM(__pyx_t_3, 0, __pyx_2); __Pyx_GIVEREF(__pyx_2); @@ -4766,17 +4301,17 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * __pyx_2 = 0; __pyx_3 = 0; __pyx_1 = 0; - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 495; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 435; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":496 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":436 * * assert_dtype(src, [UINT8, INT8, FLOAT32]) * assert_nchannels(src, [1, 3]) # <<<<<<<<<<<<<< * * if in_place: */ - __pyx_t_3 = PyList_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 496; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyList_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 436; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_int_1); PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_1); @@ -4784,20 +4319,20 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * __Pyx_INCREF(__pyx_int_3); PyList_SET_ITEM(__pyx_t_3, 1, __pyx_int_3); __Pyx_GIVEREF(__pyx_int_3); - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 496; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 436; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":498 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":438 * assert_nchannels(src, [1, 3]) * * if in_place: # <<<<<<<<<<<<<< * out = src * elif out is not None: */ - __pyx_t_6 = __Pyx_PyObject_IsTrue(((PyObject *)__pyx_v_in_place)); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 498; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(((PyObject *)__pyx_v_in_place)); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 438; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (__pyx_t_6) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":499 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":439 * * if in_place: * out = src # <<<<<<<<<<<<<< @@ -4810,7 +4345,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * goto __pyx_L12; } - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":500 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":440 * if in_place: * out = src * elif out is not None: # <<<<<<<<<<<<<< @@ -4820,26 +4355,26 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * __pyx_t_6 = (((PyObject *)__pyx_v_out) != Py_None); if (__pyx_t_6) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":501 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":441 * out = src * elif out is not None: * assert_like(src, out) # <<<<<<<<<<<<<< * else: * out = new_array_like(src) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_like(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 501; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_like(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 441; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L12; } /*else*/ { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":503 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":443 * assert_like(src, out) * else: * out = new_array_like(src) # <<<<<<<<<<<<<< * * # CV_MEDIAN and CV_BILATERAL */ - __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 503; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 443; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(((PyObject *)__pyx_v_out)); __pyx_v_out = ((PyArrayObject *)__pyx_t_3); @@ -4850,18 +4385,18 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * } /*else*/ { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":507 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":447 * # CV_MEDIAN and CV_BILATERAL * else: * assert_dtype(src, [UINT8, INT8]) # <<<<<<<<<<<<<< * assert_nchannels(src, [1, 3]) * */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_48); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 507; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 447; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_50); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 507; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_50); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 447; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_3); - __pyx_t_3 = PyList_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 507; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyList_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 447; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_3)); PyList_SET_ITEM(__pyx_t_3, 0, __pyx_2); __Pyx_GIVEREF(__pyx_2); @@ -4869,17 +4404,17 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * __Pyx_GIVEREF(__pyx_3); __pyx_2 = 0; __pyx_3 = 0; - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 507; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 447; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":508 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":448 * else: * assert_dtype(src, [UINT8, INT8]) * assert_nchannels(src, [1, 3]) # <<<<<<<<<<<<<< * * if in_place: */ - __pyx_t_3 = PyList_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 508; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyList_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 448; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_int_1); PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_1); @@ -4887,42 +4422,42 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * __Pyx_INCREF(__pyx_int_3); PyList_SET_ITEM(__pyx_t_3, 1, __pyx_int_3); __Pyx_GIVEREF(__pyx_int_3); - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 508; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 448; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":510 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":450 * assert_nchannels(src, [1, 3]) * * if in_place: # <<<<<<<<<<<<<< * raise RuntimeError('In place operation not supported with this ' * 'filter') */ - __pyx_t_6 = __Pyx_PyObject_IsTrue(((PyObject *)__pyx_v_in_place)); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 510; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(((PyObject *)__pyx_v_in_place)); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 450; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (__pyx_t_6) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":511 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":451 * * if in_place: * raise RuntimeError('In place operation not supported with this ' # <<<<<<<<<<<<<< * 'filter') * */ - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 511; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 451; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_3)); - __Pyx_INCREF(__pyx_kp_61); - PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_kp_61); - __Pyx_GIVEREF(__pyx_kp_61); - __pyx_t_4 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 511; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_INCREF(__pyx_kp_62); + PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_kp_62); + __Pyx_GIVEREF(__pyx_kp_62); + __pyx_t_4 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 451; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __Pyx_Raise(__pyx_t_4, 0, 0); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 511; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 451; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L13; } __pyx_L13:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":514 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":454 * 'filter') * * if out is not None: # <<<<<<<<<<<<<< @@ -4932,26 +4467,26 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * __pyx_t_6 = (((PyObject *)__pyx_v_out) != Py_None); if (__pyx_t_6) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":515 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":455 * * if out is not None: * assert_like(src, out) # <<<<<<<<<<<<<< * else: * out = new_array_like(src) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_like(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 515; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_like(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 455; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L14; } /*else*/ { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":517 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":457 * assert_like(src, out) * else: * out = new_array_like(src) # <<<<<<<<<<<<<< * * cdef IplImage srcimg */ - __pyx_t_4 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 517; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 457; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(((PyObject *)__pyx_v_out)); __pyx_v_out = ((PyArrayObject *)__pyx_t_4); @@ -4961,7 +4496,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * } __pyx_L7:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":521 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":461 * cdef IplImage srcimg * cdef IplImage outimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -4970,7 +4505,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":522 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":462 * cdef IplImage outimg * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -4979,7 +4514,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":524 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":464 * populate_iplimage(out, &outimg) * * c_cvSmooth(&srcimg, &outimg, smoothtype, param1, param2, param3, param4) # <<<<<<<<<<<<<< @@ -4988,7 +4523,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * */ __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvSmooth((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_smoothtype, __pyx_v_param1, __pyx_v_param2, __pyx_v_param3, __pyx_v_param4); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":526 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":466 * c_cvSmooth(&srcimg, &outimg, smoothtype, param1, param2, param3, param4) * * return out # <<<<<<<<<<<<<< @@ -5017,7 +4552,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":528 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":468 * return out * * def cvGoodFeaturesToTrack(np.ndarray src, int corner_count, # <<<<<<<<<<<<<< @@ -5038,23 +4573,20 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra double __pyx_v_k; PyArrayObject *__pyx_v_eig = 0; PyArrayObject *__pyx_v_temp = 0; - struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *__pyx_v_corners; - int __pyx_v_out_corner_count; + npy_intp __pyx_v_cornershape[2]; + PyArrayObject *__pyx_v_out = 0; + struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *__pyx_v_cvcorners; + int __pyx_v_ncorners_found; __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_srcimg; __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_eigimg; __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_tempimg; __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *__pyx_v_maskimg; - npy_intp __pyx_v_cornershape[2]; - PyArrayObject *__pyx_v_cornersarr = 0; - int __pyx_v_i; PyObject *__pyx_r = NULL; PyObject *__pyx_1 = 0; PyObject *__pyx_2 = 0; int __pyx_t_1; PyObject *__pyx_t_2 = NULL; int __pyx_t_3; - PyObject *__pyx_t_4 = NULL; - PyObject *__pyx_t_5 = NULL; static PyObject **__pyx_pyargnames[] = {&__pyx_kp_src,&__pyx_kp_corner_count,&__pyx_kp_quality_level,&__pyx_kp_min_distance,&__pyx_kp_mask,&__pyx_kp_block_size,&__pyx_kp_use_harris,&__pyx_kp_k,0}; __Pyx_SetupRefcountContext("cvGoodFeaturesToTrack"); __pyx_self = __pyx_self; @@ -5083,19 +4615,19 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_corner_count); if (likely(values[1])) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("cvGoodFeaturesToTrack", 0, 4, 8, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvGoodFeaturesToTrack", 0, 4, 8, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 468; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 2: values[2] = PyDict_GetItem(__pyx_kwds, __pyx_kp_quality_level); if (likely(values[2])) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("cvGoodFeaturesToTrack", 0, 4, 8, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvGoodFeaturesToTrack", 0, 4, 8, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 468; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 3: values[3] = PyDict_GetItem(__pyx_kwds, __pyx_kp_min_distance); if (likely(values[3])) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("cvGoodFeaturesToTrack", 0, 4, 8, 3); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvGoodFeaturesToTrack", 0, 4, 8, 3); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 468; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 4: if (kw_args > 0) { @@ -5119,25 +4651,25 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvGoodFeaturesToTrack") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvGoodFeaturesToTrack") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 468; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); - __pyx_v_corner_count = __Pyx_PyInt_AsInt(values[1]); if (unlikely((__pyx_v_corner_count == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - __pyx_v_quality_level = __pyx_PyFloat_AsDouble(values[2]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - __pyx_v_min_distance = __pyx_PyFloat_AsDouble(values[3]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_corner_count = __Pyx_PyInt_AsInt(values[1]); if (unlikely((__pyx_v_corner_count == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 468; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_quality_level = __pyx_PyFloat_AsDouble(values[2]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 469; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_min_distance = __pyx_PyFloat_AsDouble(values[3]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 469; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_v_mask = ((PyArrayObject *)values[4]); if (values[5]) { - __pyx_v_block_size = __Pyx_PyInt_AsInt(values[5]); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 530; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_block_size = __Pyx_PyInt_AsInt(values[5]); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 470; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_block_size = 3; } if (values[6]) { - __pyx_v_use_harris = __Pyx_PyInt_AsInt(values[6]); if (unlikely((__pyx_v_use_harris == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 531; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_use_harris = __Pyx_PyInt_AsInt(values[6]); if (unlikely((__pyx_v_use_harris == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 471; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_use_harris = 0; } if (values[7]) { - __pyx_v_k = __pyx_PyFloat_AsDouble(values[7]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 531; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_k = __pyx_PyFloat_AsDouble(values[7]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 471; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_k = 0.040000000000000001; } @@ -5148,17 +4680,17 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra __pyx_v_k = 0.040000000000000001; switch (PyTuple_GET_SIZE(__pyx_args)) { case 8: - __pyx_v_k = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 7)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 531; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_k = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 7)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 471; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 7: - __pyx_v_use_harris = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 6)); if (unlikely((__pyx_v_use_harris == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 531; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_use_harris = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 6)); if (unlikely((__pyx_v_use_harris == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 471; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 6: - __pyx_v_block_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 5)); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 530; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_block_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 5)); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 470; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 5: __pyx_v_mask = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 4)); case 4: - __pyx_v_min_distance = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - __pyx_v_quality_level = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - __pyx_v_corner_count = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_corner_count == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_min_distance = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 469; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_quality_level = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 469; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_corner_count = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_corner_count == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 468; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); break; default: goto __pyx_L5_argtuple_error; @@ -5166,35 +4698,35 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvGoodFeaturesToTrack", 0, 4, 8, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvGoodFeaturesToTrack", 0, 4, 8, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 468; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvGoodFeaturesToTrack"); return NULL; __pyx_L4_argument_unpacking_done:; - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_mask), __pyx_ptype_5numpy_ndarray, 1, "mask", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 530; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 468; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_mask), __pyx_ptype_5numpy_ndarray, 1, "mask", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 470; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":538 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":478 * """ * * validate_array(src) # <<<<<<<<<<<<<< * assert_dtype(src, [UINT8, FLOAT32]) * assert_nchannels(src, [1]) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 538; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 478; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":539 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":479 * * validate_array(src) * assert_dtype(src, [UINT8, FLOAT32]) # <<<<<<<<<<<<<< * assert_nchannels(src, [1]) * */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_48); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 539; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 479; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 539; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 479; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 539; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 479; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1); __Pyx_GIVEREF(__pyx_1); @@ -5202,70 +4734,103 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra __Pyx_GIVEREF(__pyx_2); __pyx_1 = 0; __pyx_2 = 0; - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 539; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 479; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":540 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":480 * validate_array(src) * assert_dtype(src, [UINT8, FLOAT32]) * assert_nchannels(src, [1]) # <<<<<<<<<<<<<< * * cdef np.ndarray eig = new_array_like_diff_dtype(src, FLOAT32) */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 540; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 480; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_int_1); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1); __Pyx_GIVEREF(__pyx_int_1); - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 540; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 480; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":542 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":482 * assert_nchannels(src, [1]) * * cdef np.ndarray eig = new_array_like_diff_dtype(src, FLOAT32) # <<<<<<<<<<<<<< * cdef np.ndarray temp = new_array_like(eig) * */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 542; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 482; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_1)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 542; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_1)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 482; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_v_eig = ((PyArrayObject *)__pyx_t_2); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":543 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":483 * * cdef np.ndarray eig = new_array_like_diff_dtype(src, FLOAT32) * cdef np.ndarray temp = new_array_like(eig) # <<<<<<<<<<<<<< * - * cdef CvPoint2D32f* corners = ( + * cdef np.npy_intp cornershape[2] */ - __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_eig)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 543; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_eig)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 483; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_v_temp = ((PyArrayObject *)__pyx_t_2); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":546 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":486 * - * cdef CvPoint2D32f* corners = ( - * PyMem_Malloc(corner_count * sizeof(CvPoint2D32f))) # <<<<<<<<<<<<<< + * cdef np.npy_intp cornershape[2] + * cornershape[0] = corner_count # <<<<<<<<<<<<<< + * cornershape[1] = 2 * - * cdef int out_corner_count */ - __pyx_v_corners = ((struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *)PyMem_Malloc((__pyx_v_corner_count * (sizeof(struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f))))); + (__pyx_v_cornershape[0]) = ((npy_intp)__pyx_v_corner_count); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":549 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":487 + * cdef np.npy_intp cornershape[2] + * cornershape[0] = corner_count + * cornershape[1] = 2 # <<<<<<<<<<<<<< * - * cdef int out_corner_count - * out_corner_count = corner_count # <<<<<<<<<<<<<< + * cdef np.ndarray out = new_array(2, cornershape, FLOAT32) + */ + (__pyx_v_cornershape[1]) = 2; + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":489 + * cornershape[1] = 2 + * + * cdef np.ndarray out = new_array(2, cornershape, FLOAT32) # <<<<<<<<<<<<<< + * cdef CvPoint2D32f* cvcorners = array_as_cvPoint2D32f_ptr(out) + * + */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 489; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_2); + __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(2, __pyx_v_cornershape, __pyx_2)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 489; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); + __Pyx_DECREF(__pyx_2); __pyx_2 = 0; + __pyx_v_out = ((PyArrayObject *)__pyx_t_2); + __pyx_t_2 = 0; + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":490 + * + * cdef np.ndarray out = new_array(2, cornershape, FLOAT32) + * cdef CvPoint2D32f* cvcorners = array_as_cvPoint2D32f_ptr(out) # <<<<<<<<<<<<<< + * + * cdef int ncorners_found + */ + __pyx_v_cvcorners = __pyx_f_7scikits_5image_6opencv_14opencv_backend_array_as_cvPoint2D32f_ptr(__pyx_v_out); + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":493 + * + * cdef int ncorners_found + * ncorners_found = corner_count # <<<<<<<<<<<<<< * * cdef IplImage srcimg */ - __pyx_v_out_corner_count = __pyx_v_corner_count; + __pyx_v_ncorners_found = __pyx_v_corner_count; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":556 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":500 * cdef IplImage *maskimg * * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -5274,7 +4839,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":557 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":501 * * populate_iplimage(src, &srcimg) * populate_iplimage(eig, &eigimg) # <<<<<<<<<<<<<< @@ -5283,7 +4848,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_eig, (&__pyx_v_eigimg)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":558 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":502 * populate_iplimage(src, &srcimg) * populate_iplimage(eig, &eigimg) * populate_iplimage(temp, &tempimg) # <<<<<<<<<<<<<< @@ -5292,7 +4857,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_temp, (&__pyx_v_tempimg)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":559 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":503 * populate_iplimage(eig, &eigimg) * populate_iplimage(temp, &tempimg) * if mask is None: # <<<<<<<<<<<<<< @@ -5302,7 +4867,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra __pyx_t_3 = (((PyObject *)__pyx_v_mask) == Py_None); if (__pyx_t_3) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":560 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":504 * populate_iplimage(temp, &tempimg) * if mask is None: * maskimg = NULL # <<<<<<<<<<<<<< @@ -5314,159 +4879,62 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra } /*else*/ { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":562 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":506 * maskimg = NULL * else: * validate_array(mask) # <<<<<<<<<<<<<< * assert_nchannels(mask, [1]) * populate_iplimage(mask, maskimg) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_mask); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 562; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_mask); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 506; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":563 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":507 * else: * validate_array(mask) * assert_nchannels(mask, [1]) # <<<<<<<<<<<<<< * populate_iplimage(mask, maskimg) * */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 563; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 507; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_int_1); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1); __Pyx_GIVEREF(__pyx_int_1); - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_mask, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 563; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_mask, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 507; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":564 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":508 * validate_array(mask) * assert_nchannels(mask, [1]) * populate_iplimage(mask, maskimg) # <<<<<<<<<<<<<< * - * c_cvGoodFeaturesToTrack(&srcimg, &eigimg, &tempimg, corners, + * c_cvGoodFeaturesToTrack(&srcimg, &eigimg, &tempimg, cvcorners, */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_mask, __pyx_v_maskimg); } __pyx_L6:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":569 - * &out_corner_count, quality_level, min_distance, + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":513 + * &ncorners_found, quality_level, min_distance, * maskimg, block_size, * use_harris, k) # <<<<<<<<<<<<<< * - * # since the maximum allowed corners may not have been found + * return out[:ncorners_found] */ - __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvGoodFeaturesToTrack((&__pyx_v_srcimg), (&__pyx_v_eigimg), (&__pyx_v_tempimg), __pyx_v_corners, (&__pyx_v_out_corner_count), __pyx_v_quality_level, __pyx_v_min_distance, __pyx_v_maskimg, __pyx_v_block_size, __pyx_v_use_harris, __pyx_v_k); + __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvGoodFeaturesToTrack((&__pyx_v_srcimg), (&__pyx_v_eigimg), (&__pyx_v_tempimg), __pyx_v_cvcorners, (&__pyx_v_ncorners_found), __pyx_v_quality_level, __pyx_v_min_distance, __pyx_v_maskimg, __pyx_v_block_size, __pyx_v_use_harris, __pyx_v_k); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":579 - * - * cdef np.npy_intp cornershape[2] - * cornershape[0] = out_corner_count # <<<<<<<<<<<<<< - * cornershape[1] = 2 - * - */ - (__pyx_v_cornershape[0]) = ((npy_intp)__pyx_v_out_corner_count); - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":580 - * cdef np.npy_intp cornershape[2] - * cornershape[0] = out_corner_count - * cornershape[1] = 2 # <<<<<<<<<<<<<< - * - * cdef np.ndarray cornersarr = new_array(2, cornershape, FLOAT32) - */ - (__pyx_v_cornershape[1]) = 2; - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":582 - * cornershape[1] = 2 - * - * cdef np.ndarray cornersarr = new_array(2, cornershape, FLOAT32) # <<<<<<<<<<<<<< - * cdef int i - * for i in range(out_corner_count): - */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 582; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_2); - __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(2, __pyx_v_cornershape, __pyx_2)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 582; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_v_cornersarr = ((PyArrayObject *)__pyx_t_2); - __pyx_t_2 = 0; - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":584 - * cdef np.ndarray cornersarr = new_array(2, cornershape, FLOAT32) - * cdef int i - * for i in range(out_corner_count): # <<<<<<<<<<<<<< - * cornersarr[i,0] = corners[i].x - * cornersarr[i,1] = corners[i].y - */ - for (__pyx_t_1 = 0; __pyx_t_1 < __pyx_v_out_corner_count; __pyx_t_1+=1) { - __pyx_v_i = __pyx_t_1; - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":585 - * cdef int i - * for i in range(out_corner_count): - * cornersarr[i,0] = corners[i].x # <<<<<<<<<<<<<< - * cornersarr[i,1] = corners[i].y - * - */ - __pyx_t_2 = PyFloat_FromDouble((__pyx_v_corners[__pyx_v_i]).x); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 585; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = PyInt_FromLong(__pyx_v_i); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 585; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_4); - __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 585; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(((PyObject *)__pyx_t_5)); - PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4); - __Pyx_GIVEREF(__pyx_t_4); - __Pyx_INCREF(__pyx_int_0); - PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_int_0); - __Pyx_GIVEREF(__pyx_int_0); - __pyx_t_4 = 0; - if (PyObject_SetItem(((PyObject *)__pyx_v_cornersarr), ((PyObject *)__pyx_t_5), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 585; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":586 - * for i in range(out_corner_count): - * cornersarr[i,0] = corners[i].x - * cornersarr[i,1] = corners[i].y # <<<<<<<<<<<<<< - * - * PyMem_Free(corners) - */ - __pyx_t_2 = PyFloat_FromDouble((__pyx_v_corners[__pyx_v_i]).y); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 586; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyInt_FromLong(__pyx_v_i); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 586; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_5); - __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 586; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(((PyObject *)__pyx_t_4)); - PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_5); - __Pyx_GIVEREF(__pyx_t_5); - __Pyx_INCREF(__pyx_int_1); - PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_int_1); - __Pyx_GIVEREF(__pyx_int_1); - __pyx_t_5 = 0; - if (PyObject_SetItem(((PyObject *)__pyx_v_cornersarr), ((PyObject *)__pyx_t_4), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 586; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - } - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":588 - * cornersarr[i,1] = corners[i].y - * - * PyMem_Free(corners) # <<<<<<<<<<<<<< - * - * return cornersarr - */ - PyMem_Free(__pyx_v_corners); - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":590 - * PyMem_Free(corners) - * - * return cornersarr # <<<<<<<<<<<<<< + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":515 + * use_harris, k) * + * return out[:ncorners_found] # <<<<<<<<<<<<<< * + * def cvResize(np.ndarray src, height=None, width=None, */ __Pyx_XDECREF(__pyx_r); - __Pyx_INCREF(((PyObject *)__pyx_v_cornersarr)); - __pyx_r = ((PyObject *)__pyx_v_cornersarr); + __pyx_1 = PySequence_GetSlice(((PyObject *)__pyx_v_out), 0, __pyx_v_ncorners_found); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 515; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_1); + __pyx_r = __pyx_1; + __pyx_1 = 0; goto __pyx_L0; __pyx_r = Py_None; __Pyx_INCREF(Py_None); @@ -5475,21 +4943,19 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra __Pyx_XDECREF(__pyx_1); __Pyx_XDECREF(__pyx_2); __Pyx_XDECREF(__pyx_t_2); - __Pyx_XDECREF(__pyx_t_4); - __Pyx_XDECREF(__pyx_t_5); __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvGoodFeaturesToTrack"); __pyx_r = NULL; __pyx_L0:; __Pyx_XDECREF((PyObject *)__pyx_v_eig); __Pyx_XDECREF((PyObject *)__pyx_v_temp); - __Pyx_XDECREF((PyObject *)__pyx_v_cornersarr); + __Pyx_XDECREF((PyObject *)__pyx_v_out); __Pyx_XGIVEREF(__pyx_r); __Pyx_FinishRefcountContext(); return __pyx_r; } -/* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":593 - * +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":517 + * return out[:ncorners_found] * * def cvResize(np.ndarray src, height=None, width=None, # <<<<<<<<<<<<<< * int method=CV_INTER_LINEAR): @@ -5554,22 +5020,22 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject * } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvResize") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 593; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvResize") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 517; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); __pyx_v_height = values[1]; __pyx_v_width = values[2]; if (values[3]) { - __pyx_v_method = __Pyx_PyInt_AsInt(values[3]); if (unlikely((__pyx_v_method == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 594; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_method = __Pyx_PyInt_AsInt(values[3]); if (unlikely((__pyx_v_method == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 518; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { - __pyx_v_method = __pyx_k_47; + __pyx_v_method = __pyx_k_45; } } else { __pyx_v_height = Py_None; __pyx_v_width = Py_None; - __pyx_v_method = __pyx_k_47; + __pyx_v_method = __pyx_k_45; switch (PyTuple_GET_SIZE(__pyx_args)) { - case 4: __pyx_v_method = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely((__pyx_v_method == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 594; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 4: __pyx_v_method = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely((__pyx_v_method == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 518; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 3: __pyx_v_width = PyTuple_GET_ITEM(__pyx_args, 2); case 2: __pyx_v_height = PyTuple_GET_ITEM(__pyx_args, 1); case 1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); @@ -5579,61 +5045,61 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject * } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvResize", 0, 1, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 593; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvResize", 0, 1, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 517; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvResize"); return NULL; __pyx_L4_argument_unpacking_done:; - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 593; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 517; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":600 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":524 * http://opencv.willowgarage.com/documentation/cvreference.html * """ * validate_array(src) # <<<<<<<<<<<<<< * * if not height or not width: */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 600; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 524; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":602 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":526 * validate_array(src) * * if not height or not width: # <<<<<<<<<<<<<< * raise ValueError('width and height must not be none') * */ - __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_height); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 602; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_height); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 526; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (!(!__pyx_t_2)) { - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_width); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 602; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_width); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 526; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_t_4 = (!__pyx_t_3); } else { __pyx_t_4 = (!__pyx_t_2); } if (__pyx_t_4) { - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":603 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":527 * * if not height or not width: * raise ValueError('width and height must not be none') # <<<<<<<<<<<<<< * * cdef int ndim = src.ndim */ - __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 603; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 527; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_5)); - __Pyx_INCREF(__pyx_kp_62); - PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_kp_62); - __Pyx_GIVEREF(__pyx_kp_62); - __pyx_t_6 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 603; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_INCREF(__pyx_kp_63); + PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_kp_63); + __Pyx_GIVEREF(__pyx_kp_63); + __pyx_t_6 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 527; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; __Pyx_Raise(__pyx_t_6, 0, 0); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 603; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 527; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L6; } __pyx_L6:; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":605 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":529 * raise ValueError('width and height must not be none') * * cdef int ndim = src.ndim # <<<<<<<<<<<<<< @@ -5642,7 +5108,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject * */ __pyx_v_ndim = __pyx_v_src->nd; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":606 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":530 * * cdef int ndim = src.ndim * cdef np.npy_intp* shape = clone_array_shape(src) # <<<<<<<<<<<<<< @@ -5651,51 +5117,51 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject * */ __pyx_v_shape = __pyx_f_7scikits_5image_6opencv_14opencv_backend_clone_array_shape(__pyx_v_src); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":607 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":531 * cdef int ndim = src.ndim * cdef np.npy_intp* shape = clone_array_shape(src) * shape[0] = height # <<<<<<<<<<<<<< * shape[1] = width * */ - __pyx_t_7 = __Pyx_PyInt_from_py_npy_intp(__pyx_v_height); if (unlikely((__pyx_t_7 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 607; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = __Pyx_PyInt_from_py_npy_intp(__pyx_v_height); if (unlikely((__pyx_t_7 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 531; __pyx_clineno = __LINE__; goto __pyx_L1_error;} (__pyx_v_shape[0]) = __pyx_t_7; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":608 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":532 * cdef np.npy_intp* shape = clone_array_shape(src) * shape[0] = height * shape[1] = width # <<<<<<<<<<<<<< * * cdef np.ndarray out = new_array(ndim, shape, src.dtype) */ - __pyx_t_7 = __Pyx_PyInt_from_py_npy_intp(__pyx_v_width); if (unlikely((__pyx_t_7 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 608; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = __Pyx_PyInt_from_py_npy_intp(__pyx_v_width); if (unlikely((__pyx_t_7 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 532; __pyx_clineno = __LINE__; goto __pyx_L1_error;} (__pyx_v_shape[1]) = __pyx_t_7; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":610 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":534 * shape[1] = width * * cdef np.ndarray out = new_array(ndim, shape, src.dtype) # <<<<<<<<<<<<<< * validate_array(out) * */ - __pyx_t_6 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 610; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 534; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_6); - __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(__pyx_v_ndim, __pyx_v_shape, __pyx_t_6)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 610; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(__pyx_v_ndim, __pyx_v_shape, __pyx_t_6)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 534; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; __pyx_v_out = ((PyArrayObject *)__pyx_t_5); __pyx_t_5 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":611 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":535 * * cdef np.ndarray out = new_array(ndim, shape, src.dtype) * validate_array(out) # <<<<<<<<<<<<<< * * PyMem_Free(shape) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 611; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 535; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":613 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":537 * validate_array(out) * * PyMem_Free(shape) # <<<<<<<<<<<<<< @@ -5704,7 +5170,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject * */ PyMem_Free(__pyx_v_shape); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":617 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":541 * cdef IplImage srcimg * cdef IplImage outimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -5713,7 +5179,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject * */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":618 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":542 * cdef IplImage outimg * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -5722,7 +5188,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject * */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg)); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":620 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":544 * populate_iplimage(out, &outimg) * * c_cvResize(&srcimg, &outimg, method) # <<<<<<<<<<<<<< @@ -5731,11 +5197,12 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject * */ __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvResize((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_method); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":622 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":546 * c_cvResize(&srcimg, &outimg, method) * * return out # <<<<<<<<<<<<<< * + * def cvFindChessboardCorners(np.ndarray src, pattern_size, */ __Pyx_XDECREF(__pyx_r); __Pyx_INCREF(((PyObject *)__pyx_v_out)); @@ -5756,7 +5223,618 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject * return __pyx_r; } -/* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":152 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":548 + * return out + * + * def cvFindChessboardCorners(np.ndarray src, pattern_size, # <<<<<<<<<<<<<< + * int flags = CV_CALIB_CB_ADAPTIVE_THRESH): + * """ + */ + +static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCorners(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ +static char __pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCorners[] = "\n Wrapper around the OpenCV cvFindChessboardCorners function.\n\n src - Image to search for chessboard corners\n pattern_size - Tuple of inner corners (w,h)\n flags - directly passed through to OpenCV\n "; +static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCorners(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { + PyArrayObject *__pyx_v_src = 0; + PyObject *__pyx_v_pattern_size = 0; + int __pyx_v_flags; + npy_intp __pyx_v_outshape[2]; + PyObject *__pyx_v_out; + struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *__pyx_v_cvpoints; + struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvSize __pyx_v_cvpattern_size; + __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_srcimg; + int __pyx_v_ncorners_found; + PyObject *__pyx_r = NULL; + PyObject *__pyx_1 = 0; + int __pyx_t_1; + PyObject *__pyx_t_2 = NULL; + npy_intp __pyx_t_3; + PyObject *__pyx_t_4 = NULL; + static PyObject **__pyx_pyargnames[] = {&__pyx_kp_src,&__pyx_kp_pattern_size,&__pyx_kp_flags,0}; + __Pyx_SetupRefcountContext("cvFindChessboardCorners"); + __pyx_self = __pyx_self; + if (unlikely(__pyx_kwds)) { + Py_ssize_t kw_args = PyDict_Size(__pyx_kwds); + PyObject* values[3] = {0,0,0}; + switch (PyTuple_GET_SIZE(__pyx_args)) { + case 3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2); + case 2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1); + case 1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0); + case 0: break; + default: goto __pyx_L5_argtuple_error; + } + switch (PyTuple_GET_SIZE(__pyx_args)) { + case 0: + values[0] = PyDict_GetItem(__pyx_kwds, __pyx_kp_src); + if (likely(values[0])) kw_args--; + else goto __pyx_L5_argtuple_error; + case 1: + values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_pattern_size); + if (likely(values[1])) kw_args--; + else { + __Pyx_RaiseArgtupleInvalid("cvFindChessboardCorners", 0, 2, 3, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 548; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + } + case 2: + if (kw_args > 0) { + PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_flags); + if (unlikely(value)) { values[2] = value; kw_args--; } + } + } + if (unlikely(kw_args > 0)) { + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvFindChessboardCorners") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 548; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + } + __pyx_v_src = ((PyArrayObject *)values[0]); + __pyx_v_pattern_size = values[1]; + if (values[2]) { + __pyx_v_flags = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 549; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + } else { + __pyx_v_flags = __pyx_k_47; + } + } else { + __pyx_v_flags = __pyx_k_47; + switch (PyTuple_GET_SIZE(__pyx_args)) { + case 3: + __pyx_v_flags = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 549; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 2: + __pyx_v_pattern_size = PyTuple_GET_ITEM(__pyx_args, 1); + __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); + break; + default: goto __pyx_L5_argtuple_error; + } + } + goto __pyx_L4_argument_unpacking_done; + __pyx_L5_argtuple_error:; + __Pyx_RaiseArgtupleInvalid("cvFindChessboardCorners", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 548; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_L3_error:; + __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvFindChessboardCorners"); + return NULL; + __pyx_L4_argument_unpacking_done:; + __pyx_v_out = Py_None; __Pyx_INCREF(Py_None); + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 548; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":558 + * """ + * + * validate_array(src) # <<<<<<<<<<<<<< + * + * assert_nchannels(src, [1, 3]) + */ + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 558; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":560 + * validate_array(src) + * + * assert_nchannels(src, [1, 3]) # <<<<<<<<<<<<<< + * assert_dtype(src, [UINT8]) + * + */ + __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 560; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); + __Pyx_INCREF(__pyx_int_1); + PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1); + __Pyx_GIVEREF(__pyx_int_1); + __Pyx_INCREF(__pyx_int_3); + PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3); + __Pyx_GIVEREF(__pyx_int_3); + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 560; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":561 + * + * assert_nchannels(src, [1, 3]) + * assert_dtype(src, [UINT8]) # <<<<<<<<<<<<<< + * + * cdef np.npy_intp outshape[2] + */ + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 561; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_1); + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 561; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); + PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1); + __Pyx_GIVEREF(__pyx_1); + __pyx_1 = 0; + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 561; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":564 + * + * cdef np.npy_intp outshape[2] + * outshape[0] = pattern_size[0] * pattern_size[1] # <<<<<<<<<<<<<< + * outshape[1] = 2 + * + */ + __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 564; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_1); + __pyx_t_3 = __Pyx_PyInt_from_py_npy_intp(__pyx_1); if (unlikely((__pyx_t_3 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 564; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_1); __pyx_1 = 0; + __pyx_t_2 = __Pyx_PyInt_to_py_npy_intp(((npy_intp)__pyx_t_3)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 564; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); + __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 564; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_1); + __pyx_t_4 = PyNumber_Multiply(__pyx_t_2, __pyx_1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 564; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_4); + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_1); __pyx_1 = 0; + __pyx_t_3 = __Pyx_PyInt_from_py_npy_intp(__pyx_t_4); if (unlikely((__pyx_t_3 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 564; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + (__pyx_v_outshape[0]) = __pyx_t_3; + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":565 + * cdef np.npy_intp outshape[2] + * outshape[0] = pattern_size[0] * pattern_size[1] + * outshape[1] = 2 # <<<<<<<<<<<<<< + * + * out = new_array(2, outshape, FLOAT32) + */ + (__pyx_v_outshape[1]) = ((npy_intp)2); + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":567 + * outshape[1] = 2 + * + * out = new_array(2, outshape, FLOAT32) # <<<<<<<<<<<<<< + * cdef CvPoint2D32f* cvpoints = array_as_cvPoint2D32f_ptr(out) + * + */ + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 567; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_1); + __pyx_t_4 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(2, __pyx_v_outshape, __pyx_1)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 567; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_4); + __Pyx_DECREF(__pyx_1); __pyx_1 = 0; + __Pyx_DECREF(__pyx_v_out); + __pyx_v_out = __pyx_t_4; + __pyx_t_4 = 0; + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":568 + * + * out = new_array(2, outshape, FLOAT32) + * cdef CvPoint2D32f* cvpoints = array_as_cvPoint2D32f_ptr(out) # <<<<<<<<<<<<<< + * + * cdef CvSize cvpattern_size + */ + if (!(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 568; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_v_cvpoints = __pyx_f_7scikits_5image_6opencv_14opencv_backend_array_as_cvPoint2D32f_ptr(((PyArrayObject *)__pyx_v_out)); + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":571 + * + * cdef CvSize cvpattern_size + * cvpattern_size.height = pattern_size[0] # <<<<<<<<<<<<<< + * cvpattern_size.width = pattern_size[1] + * + */ + __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 571; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_1); + __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 571; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_1); __pyx_1 = 0; + __pyx_v_cvpattern_size.height = __pyx_t_1; + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":572 + * cdef CvSize cvpattern_size + * cvpattern_size.height = pattern_size[0] + * cvpattern_size.width = pattern_size[1] # <<<<<<<<<<<<<< + * + * cdef IplImage srcimg + */ + __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 572; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_1); + __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 572; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_1); __pyx_1 = 0; + __pyx_v_cvpattern_size.width = __pyx_t_1; + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":575 + * + * cdef IplImage srcimg + * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< + * + * cdef int ncorners_found + */ + __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg)); + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":579 + * cdef int ncorners_found + * c_cvFindChessboardCorners(&srcimg, cvpattern_size, cvpoints, + * &ncorners_found, flags) # <<<<<<<<<<<<<< + * + * return out[:ncorners_found] + */ + __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvFindChessboardCorners((&__pyx_v_srcimg), __pyx_v_cvpattern_size, __pyx_v_cvpoints, (&__pyx_v_ncorners_found), __pyx_v_flags); + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":581 + * &ncorners_found, flags) + * + * return out[:ncorners_found] # <<<<<<<<<<<<<< + * + * def cvDrawChessboardCorners(np.ndarray src, pattern_size, np.ndarray corners, + */ + __Pyx_XDECREF(__pyx_r); + __pyx_1 = PySequence_GetSlice(__pyx_v_out, 0, __pyx_v_ncorners_found); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 581; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_1); + __pyx_r = __pyx_1; + __pyx_1 = 0; + goto __pyx_L0; + + __pyx_r = Py_None; __Pyx_INCREF(Py_None); + goto __pyx_L0; + __pyx_L1_error:; + __Pyx_XDECREF(__pyx_1); + __Pyx_XDECREF(__pyx_t_2); + __Pyx_XDECREF(__pyx_t_4); + __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvFindChessboardCorners"); + __pyx_r = NULL; + __pyx_L0:; + __Pyx_DECREF(__pyx_v_out); + __Pyx_XGIVEREF(__pyx_r); + __Pyx_FinishRefcountContext(); + return __pyx_r; +} + +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":583 + * return out[:ncorners_found] + * + * def cvDrawChessboardCorners(np.ndarray src, pattern_size, np.ndarray corners, # <<<<<<<<<<<<<< + * in_place=True): + * """ + */ + +static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCorners(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ +static char __pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCorners[] = "\n Wrapper around the OpenCV cvDrawChessboardCorners function.\n\n Parameters\n ----------\n src : ndarray, dim 3, dtype: uint8\n Image to draw into.\n pattern_size : array_like, shape (2,)\n Number of inner corners (w,h)\n corners : ndarray, shape (n,2), dtype: float32\n Corners found in the image. See cvFindChessboardCorners and\n cvFindCornerSubPix\n in_place: True/False (default=True) perform the drawing on the submitted\n image. If false, a copy of the image will be made and drawn to. \n "; +static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCorners(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { + PyArrayObject *__pyx_v_src = 0; + PyObject *__pyx_v_pattern_size = 0; + PyArrayObject *__pyx_v_corners = 0; + PyObject *__pyx_v_in_place = 0; + PyArrayObject *__pyx_v_out; + struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvSize __pyx_v_cvpattern_size; + __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_outimg; + struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *__pyx_v_cvcorners; + int __pyx_v_ncount; + int __pyx_v_pattern_was_found; + PyObject *__pyx_r = NULL; + PyObject *__pyx_1 = 0; + PyObject *__pyx_2 = 0; + int __pyx_t_1; + PyObject *__pyx_t_2 = NULL; + int __pyx_t_3; + int __pyx_t_4; + PyObject *__pyx_t_5 = NULL; + static PyObject **__pyx_pyargnames[] = {&__pyx_kp_src,&__pyx_kp_pattern_size,&__pyx_kp_corners,&__pyx_kp_in_place,0}; + __Pyx_SetupRefcountContext("cvDrawChessboardCorners"); + __pyx_self = __pyx_self; + if (unlikely(__pyx_kwds)) { + Py_ssize_t kw_args = PyDict_Size(__pyx_kwds); + PyObject* values[4] = {0,0,0,0}; + values[3] = __pyx_k_48; + switch (PyTuple_GET_SIZE(__pyx_args)) { + case 4: values[3] = PyTuple_GET_ITEM(__pyx_args, 3); + case 3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2); + case 2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1); + case 1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0); + case 0: break; + default: goto __pyx_L5_argtuple_error; + } + switch (PyTuple_GET_SIZE(__pyx_args)) { + case 0: + values[0] = PyDict_GetItem(__pyx_kwds, __pyx_kp_src); + if (likely(values[0])) kw_args--; + else goto __pyx_L5_argtuple_error; + case 1: + values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_pattern_size); + if (likely(values[1])) kw_args--; + else { + __Pyx_RaiseArgtupleInvalid("cvDrawChessboardCorners", 0, 3, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 583; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + } + case 2: + values[2] = PyDict_GetItem(__pyx_kwds, __pyx_kp_corners); + if (likely(values[2])) kw_args--; + else { + __Pyx_RaiseArgtupleInvalid("cvDrawChessboardCorners", 0, 3, 4, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 583; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + } + case 3: + if (kw_args > 0) { + PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_in_place); + if (unlikely(value)) { values[3] = value; kw_args--; } + } + } + if (unlikely(kw_args > 0)) { + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvDrawChessboardCorners") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 583; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + } + __pyx_v_src = ((PyArrayObject *)values[0]); + __pyx_v_pattern_size = values[1]; + __pyx_v_corners = ((PyArrayObject *)values[2]); + __pyx_v_in_place = values[3]; + } else { + __pyx_v_in_place = __pyx_k_48; + switch (PyTuple_GET_SIZE(__pyx_args)) { + case 4: + __pyx_v_in_place = PyTuple_GET_ITEM(__pyx_args, 3); + case 3: + __pyx_v_corners = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 2)); + __pyx_v_pattern_size = PyTuple_GET_ITEM(__pyx_args, 1); + __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); + break; + default: goto __pyx_L5_argtuple_error; + } + } + goto __pyx_L4_argument_unpacking_done; + __pyx_L5_argtuple_error:; + __Pyx_RaiseArgtupleInvalid("cvDrawChessboardCorners", 0, 3, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 583; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_L3_error:; + __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvDrawChessboardCorners"); + return NULL; + __pyx_L4_argument_unpacking_done:; + __pyx_v_out = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 583; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_corners), __pyx_ptype_5numpy_ndarray, 1, "corners", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 583; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":600 + * image. If false, a copy of the image will be made and drawn to. + * """ + * validate_array(src) # <<<<<<<<<<<<<< + * + * assert_nchannels(src, [3]) + */ + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 600; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":602 + * validate_array(src) + * + * assert_nchannels(src, [3]) # <<<<<<<<<<<<<< + * assert_dtype(src, [UINT8]) + * + */ + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 602; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); + __Pyx_INCREF(__pyx_int_3); + PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_3); + __Pyx_GIVEREF(__pyx_int_3); + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 602; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":603 + * + * assert_nchannels(src, [3]) + * assert_dtype(src, [UINT8]) # <<<<<<<<<<<<<< + * + * assert_ndims(corners, [2]) + */ + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 603; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_1); + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 603; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); + PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1); + __Pyx_GIVEREF(__pyx_1); + __pyx_1 = 0; + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 603; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":605 + * assert_dtype(src, [UINT8]) + * + * assert_ndims(corners, [2]) # <<<<<<<<<<<<<< + * assert_dtype(corners, [FLOAT32]) + * + */ + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 605; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); + __Pyx_INCREF(__pyx_int_2); + PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_2); + __Pyx_GIVEREF(__pyx_int_2); + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(__pyx_v_corners, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 605; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":606 + * + * assert_ndims(corners, [2]) + * assert_dtype(corners, [FLOAT32]) # <<<<<<<<<<<<<< + * + * cdef np.ndarray out + */ + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 606; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_1); + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 606; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); + PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1); + __Pyx_GIVEREF(__pyx_1); + __pyx_1 = 0; + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_corners, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 606; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":610 + * cdef np.ndarray out + * + * if not in_place: # <<<<<<<<<<<<<< + * out = src.copy() + * else: + */ + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 610; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = (!__pyx_t_3); + if (__pyx_t_4) { + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":611 + * + * if not in_place: + * out = src.copy() # <<<<<<<<<<<<<< + * else: + * out = src + */ + __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_copy); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 611; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_5 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 611; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_5); + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + if (!(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 611; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(((PyObject *)__pyx_v_out)); + __pyx_v_out = ((PyArrayObject *)__pyx_t_5); + __pyx_t_5 = 0; + goto __pyx_L6; + } + /*else*/ { + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":613 + * out = src.copy() + * else: + * out = src # <<<<<<<<<<<<<< + * + * cdef CvSize cvpattern_size + */ + __Pyx_INCREF(((PyObject *)__pyx_v_src)); + __Pyx_DECREF(((PyObject *)__pyx_v_out)); + __pyx_v_out = __pyx_v_src; + } + __pyx_L6:; + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":616 + * + * cdef CvSize cvpattern_size + * cvpattern_size.height = pattern_size[0] # <<<<<<<<<<<<<< + * cvpattern_size.width = pattern_size[1] + * + */ + __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 616; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_1); + __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 616; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_1); __pyx_1 = 0; + __pyx_v_cvpattern_size.height = __pyx_t_1; + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":617 + * cdef CvSize cvpattern_size + * cvpattern_size.height = pattern_size[0] + * cvpattern_size.width = pattern_size[1] # <<<<<<<<<<<<<< + * + * cdef IplImage outimg + */ + __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 617; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_1); + __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 617; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_1); __pyx_1 = 0; + __pyx_v_cvpattern_size.width = __pyx_t_1; + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":620 + * + * cdef IplImage outimg + * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< + * + * cdef CvPoint2D32f* cvcorners = array_as_cvPoint2D32f_ptr(corners) + */ + __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg)); + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":622 + * populate_iplimage(out, &outimg) + * + * cdef CvPoint2D32f* cvcorners = array_as_cvPoint2D32f_ptr(corners) # <<<<<<<<<<<<<< + * + * cdef int ncount = pattern_size[0] * pattern_size[1] + */ + __pyx_v_cvcorners = __pyx_f_7scikits_5image_6opencv_14opencv_backend_array_as_cvPoint2D32f_ptr(__pyx_v_corners); + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":624 + * cdef CvPoint2D32f* cvcorners = array_as_cvPoint2D32f_ptr(corners) + * + * cdef int ncount = pattern_size[0] * pattern_size[1] # <<<<<<<<<<<<<< + * + * cdef int pattern_was_found + */ + __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 624; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_1); + __pyx_2 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 624; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_2); + __pyx_t_5 = PyNumber_Multiply(__pyx_1, __pyx_2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 624; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_5); + __Pyx_DECREF(__pyx_1); __pyx_1 = 0; + __Pyx_DECREF(__pyx_2); __pyx_2 = 0; + __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_t_5); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 624; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __pyx_v_ncount = __pyx_t_1; + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":628 + * cdef int pattern_was_found + * + * if corners.shape[0] == ncount: # <<<<<<<<<<<<<< + * pattern_was_found = 1 + * else: + */ + __pyx_t_4 = ((__pyx_v_corners->dimensions[0]) == __pyx_v_ncount); + if (__pyx_t_4) { + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":629 + * + * if corners.shape[0] == ncount: + * pattern_was_found = 1 # <<<<<<<<<<<<<< + * else: + * pattern_was_found = 0 + */ + __pyx_v_pattern_was_found = 1; + goto __pyx_L7; + } + /*else*/ { + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":631 + * pattern_was_found = 1 + * else: + * pattern_was_found = 0 # <<<<<<<<<<<<<< + * + * c_cvDrawChessboardCorners(&outimg, cvpattern_size, cvcorners, + */ + __pyx_v_pattern_was_found = 0; + } + __pyx_L7:; + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":634 + * + * c_cvDrawChessboardCorners(&outimg, cvpattern_size, cvcorners, + * ncount, pattern_was_found) # <<<<<<<<<<<<<< + * + * return out + */ + __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvDrawChessboardCorners((&__pyx_v_outimg), __pyx_v_cvpattern_size, __pyx_v_cvcorners, __pyx_v_ncount, __pyx_v_pattern_was_found); + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":636 + * ncount, pattern_was_found) + * + * return out # <<<<<<<<<<<<<< + * + * + */ + __Pyx_XDECREF(__pyx_r); + __Pyx_INCREF(((PyObject *)__pyx_v_out)); + __pyx_r = ((PyObject *)__pyx_v_out); + goto __pyx_L0; + + __pyx_r = Py_None; __Pyx_INCREF(Py_None); + goto __pyx_L0; + __pyx_L1_error:; + __Pyx_XDECREF(__pyx_1); + __Pyx_XDECREF(__pyx_2); + __Pyx_XDECREF(__pyx_t_2); + __Pyx_XDECREF(__pyx_t_5); + __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvDrawChessboardCorners"); + __pyx_r = NULL; + __pyx_L0:; + __Pyx_DECREF((PyObject *)__pyx_v_out); + __Pyx_XGIVEREF(__pyx_r); + __Pyx_FinishRefcountContext(); + return __pyx_r; +} + +/* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":152 * # experimental exception made for __getbuffer__ and __releasebuffer__ * # -- the details of this may change. * def __getbuffer__(ndarray self, Py_buffer* info, int flags): # <<<<<<<<<<<<<< @@ -5789,7 +5867,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf __pyx_v_info->obj = Py_None; __Pyx_INCREF(Py_None); __Pyx_GIVEREF(__pyx_v_info->obj); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":158 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":158 * # of flags * cdef int copy_shape, i, ndim * cdef int endian_detector = 1 # <<<<<<<<<<<<<< @@ -5798,7 +5876,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_endian_detector = 1; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":159 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":159 * cdef int copy_shape, i, ndim * cdef int endian_detector = 1 * cdef bint little_endian = ((&endian_detector)[0] != 0) # <<<<<<<<<<<<<< @@ -5807,7 +5885,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_little_endian = ((((char *)(&__pyx_v_endian_detector))[0]) != 0); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":161 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":161 * cdef bint little_endian = ((&endian_detector)[0] != 0) * * ndim = PyArray_NDIM(self) # <<<<<<<<<<<<<< @@ -5816,7 +5894,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_ndim = PyArray_NDIM(((PyArrayObject *)__pyx_v_self)); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":163 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":163 * ndim = PyArray_NDIM(self) * * if sizeof(npy_intp) != sizeof(Py_ssize_t): # <<<<<<<<<<<<<< @@ -5826,7 +5904,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf __pyx_t_1 = ((sizeof(npy_intp)) != (sizeof(Py_ssize_t))); if (__pyx_t_1) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":164 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":164 * * if sizeof(npy_intp) != sizeof(Py_ssize_t): * copy_shape = 1 # <<<<<<<<<<<<<< @@ -5838,7 +5916,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } /*else*/ { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":166 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":166 * copy_shape = 1 * else: * copy_shape = 0 # <<<<<<<<<<<<<< @@ -5849,7 +5927,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } __pyx_L5:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":168 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":168 * copy_shape = 0 * * if ((flags & pybuf.PyBUF_C_CONTIGUOUS == pybuf.PyBUF_C_CONTIGUOUS) # <<<<<<<<<<<<<< @@ -5858,7 +5936,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ if (((__pyx_v_flags & PyBUF_C_CONTIGUOUS) == PyBUF_C_CONTIGUOUS)) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":169 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":169 * * if ((flags & pybuf.PyBUF_C_CONTIGUOUS == pybuf.PyBUF_C_CONTIGUOUS) * and not PyArray_CHKFLAGS(self, NPY_C_CONTIGUOUS)): # <<<<<<<<<<<<<< @@ -5871,7 +5949,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } if (__pyx_t_1) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":170 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":170 * if ((flags & pybuf.PyBUF_C_CONTIGUOUS == pybuf.PyBUF_C_CONTIGUOUS) * and not PyArray_CHKFLAGS(self, NPY_C_CONTIGUOUS)): * raise ValueError("ndarray is not C contiguous") # <<<<<<<<<<<<<< @@ -5893,7 +5971,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } __pyx_L6:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":172 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":172 * raise ValueError("ndarray is not C contiguous") * * if ((flags & pybuf.PyBUF_F_CONTIGUOUS == pybuf.PyBUF_F_CONTIGUOUS) # <<<<<<<<<<<<<< @@ -5902,7 +5980,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ if (((__pyx_v_flags & PyBUF_F_CONTIGUOUS) == PyBUF_F_CONTIGUOUS)) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":173 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":173 * * if ((flags & pybuf.PyBUF_F_CONTIGUOUS == pybuf.PyBUF_F_CONTIGUOUS) * and not PyArray_CHKFLAGS(self, NPY_F_CONTIGUOUS)): # <<<<<<<<<<<<<< @@ -5915,7 +5993,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } if (__pyx_t_1) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":174 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":174 * if ((flags & pybuf.PyBUF_F_CONTIGUOUS == pybuf.PyBUF_F_CONTIGUOUS) * and not PyArray_CHKFLAGS(self, NPY_F_CONTIGUOUS)): * raise ValueError("ndarray is not Fortran contiguous") # <<<<<<<<<<<<<< @@ -5937,7 +6015,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } __pyx_L7:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":176 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":176 * raise ValueError("ndarray is not Fortran contiguous") * * info.buf = PyArray_DATA(self) # <<<<<<<<<<<<<< @@ -5946,7 +6024,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_info->buf = PyArray_DATA(((PyArrayObject *)__pyx_v_self)); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":177 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":177 * * info.buf = PyArray_DATA(self) * info.ndim = ndim # <<<<<<<<<<<<<< @@ -5955,7 +6033,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_info->ndim = __pyx_v_ndim; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":178 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":178 * info.buf = PyArray_DATA(self) * info.ndim = ndim * if copy_shape: # <<<<<<<<<<<<<< @@ -5965,7 +6043,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf __pyx_t_4 = __pyx_v_copy_shape; if (__pyx_t_4) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":181 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":181 * # Allocate new buffer for strides and shape info. This is allocated * # as one block, strides first. * info.strides = stdlib.malloc(sizeof(Py_ssize_t) * ndim * 2) # <<<<<<<<<<<<<< @@ -5974,7 +6052,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_info->strides = ((Py_ssize_t *)malloc((((sizeof(Py_ssize_t)) * __pyx_v_ndim) * 2))); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":182 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":182 * # as one block, strides first. * info.strides = stdlib.malloc(sizeof(Py_ssize_t) * ndim * 2) * info.shape = info.strides + ndim # <<<<<<<<<<<<<< @@ -5983,7 +6061,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_info->shape = (__pyx_v_info->strides + __pyx_v_ndim); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":183 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":183 * info.strides = stdlib.malloc(sizeof(Py_ssize_t) * ndim * 2) * info.shape = info.strides + ndim * for i in range(ndim): # <<<<<<<<<<<<<< @@ -5993,7 +6071,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_v_ndim; __pyx_t_4+=1) { __pyx_v_i = __pyx_t_4; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":184 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":184 * info.shape = info.strides + ndim * for i in range(ndim): * info.strides[i] = PyArray_STRIDES(self)[i] # <<<<<<<<<<<<<< @@ -6002,7 +6080,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ (__pyx_v_info->strides[__pyx_v_i]) = (PyArray_STRIDES(((PyArrayObject *)__pyx_v_self))[__pyx_v_i]); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":185 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":185 * for i in range(ndim): * info.strides[i] = PyArray_STRIDES(self)[i] * info.shape[i] = PyArray_DIMS(self)[i] # <<<<<<<<<<<<<< @@ -6015,7 +6093,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } /*else*/ { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":187 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":187 * info.shape[i] = PyArray_DIMS(self)[i] * else: * info.strides = PyArray_STRIDES(self) # <<<<<<<<<<<<<< @@ -6024,7 +6102,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_info->strides = ((Py_ssize_t *)PyArray_STRIDES(((PyArrayObject *)__pyx_v_self))); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":188 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":188 * else: * info.strides = PyArray_STRIDES(self) * info.shape = PyArray_DIMS(self) # <<<<<<<<<<<<<< @@ -6035,7 +6113,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } __pyx_L8:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":189 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":189 * info.strides = PyArray_STRIDES(self) * info.shape = PyArray_DIMS(self) * info.suboffsets = NULL # <<<<<<<<<<<<<< @@ -6044,7 +6122,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_info->suboffsets = NULL; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":190 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":190 * info.shape = PyArray_DIMS(self) * info.suboffsets = NULL * info.itemsize = PyArray_ITEMSIZE(self) # <<<<<<<<<<<<<< @@ -6053,7 +6131,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_info->itemsize = PyArray_ITEMSIZE(((PyArrayObject *)__pyx_v_self)); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":191 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":191 * info.suboffsets = NULL * info.itemsize = PyArray_ITEMSIZE(self) * info.readonly = not PyArray_ISWRITEABLE(self) # <<<<<<<<<<<<<< @@ -6062,7 +6140,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_info->readonly = (!PyArray_ISWRITEABLE(((PyArrayObject *)__pyx_v_self))); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":194 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":194 * * cdef int t * cdef char* f = NULL # <<<<<<<<<<<<<< @@ -6071,7 +6149,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_f = NULL; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":195 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":195 * cdef int t * cdef char* f = NULL * cdef dtype descr = self.descr # <<<<<<<<<<<<<< @@ -6081,7 +6159,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf __Pyx_INCREF(((PyObject *)((PyArrayObject *)__pyx_v_self)->descr)); __pyx_v_descr = ((PyArrayObject *)__pyx_v_self)->descr; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":199 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":199 * cdef int offset * * cdef bint hasfields = PyDataType_HASFIELDS(descr) # <<<<<<<<<<<<<< @@ -6090,7 +6168,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_hasfields = PyDataType_HASFIELDS(__pyx_v_descr); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":201 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":201 * cdef bint hasfields = PyDataType_HASFIELDS(descr) * * if not hasfields and not copy_shape: # <<<<<<<<<<<<<< @@ -6104,7 +6182,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } if (__pyx_t_1) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":203 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":203 * if not hasfields and not copy_shape: * # do not call releasebuffer * info.obj = None # <<<<<<<<<<<<<< @@ -6120,7 +6198,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } /*else*/ { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":206 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":206 * else: * # need to call releasebuffer * info.obj = self # <<<<<<<<<<<<<< @@ -6135,7 +6213,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } __pyx_L11:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":208 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":208 * info.obj = self * * if not hasfields: # <<<<<<<<<<<<<< @@ -6145,7 +6223,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf __pyx_t_1 = (!__pyx_v_hasfields); if (__pyx_t_1) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":209 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":209 * * if not hasfields: * t = descr.type_num # <<<<<<<<<<<<<< @@ -6154,7 +6232,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_t = __pyx_v_descr->type_num; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":210 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":210 * if not hasfields: * t = descr.type_num * if ((descr.byteorder == '>' and little_endian) or # <<<<<<<<<<<<<< @@ -6168,7 +6246,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } if (!__pyx_t_1) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":211 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":211 * t = descr.type_num * if ((descr.byteorder == '>' and little_endian) or * (descr.byteorder == '<' and not little_endian)): # <<<<<<<<<<<<<< @@ -6186,7 +6264,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } if (__pyx_t_6) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":212 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":212 * if ((descr.byteorder == '>' and little_endian) or * (descr.byteorder == '<' and not little_endian)): * raise ValueError("Non-native byte order not supported") # <<<<<<<<<<<<<< @@ -6208,7 +6286,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } __pyx_L13:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":213 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":213 * (descr.byteorder == '<' and not little_endian)): * raise ValueError("Non-native byte order not supported") * if t == NPY_BYTE: f = "b" # <<<<<<<<<<<<<< @@ -6221,7 +6299,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":214 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":214 * raise ValueError("Non-native byte order not supported") * if t == NPY_BYTE: f = "b" * elif t == NPY_UBYTE: f = "B" # <<<<<<<<<<<<<< @@ -6234,7 +6312,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":215 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":215 * if t == NPY_BYTE: f = "b" * elif t == NPY_UBYTE: f = "B" * elif t == NPY_SHORT: f = "h" # <<<<<<<<<<<<<< @@ -6247,7 +6325,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":216 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":216 * elif t == NPY_UBYTE: f = "B" * elif t == NPY_SHORT: f = "h" * elif t == NPY_USHORT: f = "H" # <<<<<<<<<<<<<< @@ -6260,7 +6338,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":217 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":217 * elif t == NPY_SHORT: f = "h" * elif t == NPY_USHORT: f = "H" * elif t == NPY_INT: f = "i" # <<<<<<<<<<<<<< @@ -6273,7 +6351,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":218 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":218 * elif t == NPY_USHORT: f = "H" * elif t == NPY_INT: f = "i" * elif t == NPY_UINT: f = "I" # <<<<<<<<<<<<<< @@ -6286,7 +6364,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":219 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":219 * elif t == NPY_INT: f = "i" * elif t == NPY_UINT: f = "I" * elif t == NPY_LONG: f = "l" # <<<<<<<<<<<<<< @@ -6299,7 +6377,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":220 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":220 * elif t == NPY_UINT: f = "I" * elif t == NPY_LONG: f = "l" * elif t == NPY_ULONG: f = "L" # <<<<<<<<<<<<<< @@ -6312,7 +6390,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":221 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":221 * elif t == NPY_LONG: f = "l" * elif t == NPY_ULONG: f = "L" * elif t == NPY_LONGLONG: f = "q" # <<<<<<<<<<<<<< @@ -6325,7 +6403,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":222 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":222 * elif t == NPY_ULONG: f = "L" * elif t == NPY_LONGLONG: f = "q" * elif t == NPY_ULONGLONG: f = "Q" # <<<<<<<<<<<<<< @@ -6338,7 +6416,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":223 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":223 * elif t == NPY_LONGLONG: f = "q" * elif t == NPY_ULONGLONG: f = "Q" * elif t == NPY_FLOAT: f = "f" # <<<<<<<<<<<<<< @@ -6351,7 +6429,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":224 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":224 * elif t == NPY_ULONGLONG: f = "Q" * elif t == NPY_FLOAT: f = "f" * elif t == NPY_DOUBLE: f = "d" # <<<<<<<<<<<<<< @@ -6364,7 +6442,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":225 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":225 * elif t == NPY_FLOAT: f = "f" * elif t == NPY_DOUBLE: f = "d" * elif t == NPY_LONGDOUBLE: f = "g" # <<<<<<<<<<<<<< @@ -6377,7 +6455,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":226 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":226 * elif t == NPY_DOUBLE: f = "d" * elif t == NPY_LONGDOUBLE: f = "g" * elif t == NPY_CFLOAT: f = "Zf" # <<<<<<<<<<<<<< @@ -6390,7 +6468,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":227 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":227 * elif t == NPY_LONGDOUBLE: f = "g" * elif t == NPY_CFLOAT: f = "Zf" * elif t == NPY_CDOUBLE: f = "Zd" # <<<<<<<<<<<<<< @@ -6403,7 +6481,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":228 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":228 * elif t == NPY_CFLOAT: f = "Zf" * elif t == NPY_CDOUBLE: f = "Zd" * elif t == NPY_CLONGDOUBLE: f = "Zg" # <<<<<<<<<<<<<< @@ -6416,7 +6494,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf goto __pyx_L14; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":229 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":229 * elif t == NPY_CDOUBLE: f = "Zd" * elif t == NPY_CLONGDOUBLE: f = "Zg" * elif t == NPY_OBJECT: f = "O" # <<<<<<<<<<<<<< @@ -6430,7 +6508,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } /*else*/ { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":231 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":231 * elif t == NPY_OBJECT: f = "O" * else: * raise ValueError("unknown dtype code in numpy.pxd (%d)" % t) # <<<<<<<<<<<<<< @@ -6456,7 +6534,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } __pyx_L14:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":232 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":232 * else: * raise ValueError("unknown dtype code in numpy.pxd (%d)" % t) * info.format = f # <<<<<<<<<<<<<< @@ -6465,7 +6543,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_info->format = __pyx_v_f; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":233 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":233 * raise ValueError("unknown dtype code in numpy.pxd (%d)" % t) * info.format = f * return # <<<<<<<<<<<<<< @@ -6478,7 +6556,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf } /*else*/ { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":235 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":235 * return * else: * info.format = stdlib.malloc(_buffer_format_string_len) # <<<<<<<<<<<<<< @@ -6487,7 +6565,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_info->format = ((char *)malloc(255)); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":236 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":236 * else: * info.format = stdlib.malloc(_buffer_format_string_len) * info.format[0] = '^' # Native data types, manual alignment # <<<<<<<<<<<<<< @@ -6496,7 +6574,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ (__pyx_v_info->format[0]) = '^'; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":237 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":237 * info.format = stdlib.malloc(_buffer_format_string_len) * info.format[0] = '^' # Native data types, manual alignment * offset = 0 # <<<<<<<<<<<<<< @@ -6505,7 +6583,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf */ __pyx_v_offset = 0; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":240 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":240 * f = _util_dtypestring(descr, info.format + 1, * info.format + _buffer_format_string_len, * &offset) # <<<<<<<<<<<<<< @@ -6515,7 +6593,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf __pyx_t_7 = __pyx_f_5numpy__util_dtypestring(__pyx_v_descr, (__pyx_v_info->format + 1), (__pyx_v_info->format + 255), (&__pyx_v_offset)); if (unlikely(__pyx_t_7 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 238; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_v_f = __pyx_t_7; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":241 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":241 * info.format + _buffer_format_string_len, * &offset) * f[0] = 0 # Terminate format string # <<<<<<<<<<<<<< @@ -6547,7 +6625,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buf return __pyx_r; } -/* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":243 +/* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":243 * f[0] = 0 # Terminate format string * * def __releasebuffer__(ndarray self, Py_buffer* info): # <<<<<<<<<<<<<< @@ -6560,7 +6638,7 @@ static void __pyx_pf_5numpy_7ndarray___releasebuffer__(PyObject *__pyx_v_self, P int __pyx_t_1; __Pyx_SetupRefcountContext("__releasebuffer__"); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":244 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":244 * * def __releasebuffer__(ndarray self, Py_buffer* info): * if PyArray_HASFIELDS(self): # <<<<<<<<<<<<<< @@ -6570,7 +6648,7 @@ static void __pyx_pf_5numpy_7ndarray___releasebuffer__(PyObject *__pyx_v_self, P __pyx_t_1 = PyArray_HASFIELDS(((PyArrayObject *)__pyx_v_self)); if (__pyx_t_1) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":245 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":245 * def __releasebuffer__(ndarray self, Py_buffer* info): * if PyArray_HASFIELDS(self): * stdlib.free(info.format) # <<<<<<<<<<<<<< @@ -6582,7 +6660,7 @@ static void __pyx_pf_5numpy_7ndarray___releasebuffer__(PyObject *__pyx_v_self, P } __pyx_L5:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":246 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":246 * if PyArray_HASFIELDS(self): * stdlib.free(info.format) * if sizeof(npy_intp) != sizeof(Py_ssize_t): # <<<<<<<<<<<<<< @@ -6592,7 +6670,7 @@ static void __pyx_pf_5numpy_7ndarray___releasebuffer__(PyObject *__pyx_v_self, P __pyx_t_1 = ((sizeof(npy_intp)) != (sizeof(Py_ssize_t))); if (__pyx_t_1) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":247 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":247 * stdlib.free(info.format) * if sizeof(npy_intp) != sizeof(Py_ssize_t): * stdlib.free(info.strides) # <<<<<<<<<<<<<< @@ -6607,7 +6685,7 @@ static void __pyx_pf_5numpy_7ndarray___releasebuffer__(PyObject *__pyx_v_self, P __Pyx_FinishRefcountContext(); } -/* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":690 +/* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":690 * ctypedef npy_cdouble complex_t * * cdef inline char* _util_dtypestring(dtype descr, char* f, char* end, int* offset) except NULL: # <<<<<<<<<<<<<< @@ -6643,7 +6721,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc __pyx_v_new_offset = Py_None; __Pyx_INCREF(Py_None); __pyx_v_t = Py_None; __Pyx_INCREF(Py_None); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":697 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":697 * cdef int delta_offset * cdef tuple i * cdef int endian_detector = 1 # <<<<<<<<<<<<<< @@ -6652,7 +6730,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc */ __pyx_v_endian_detector = 1; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":698 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":698 * cdef tuple i * cdef int endian_detector = 1 * cdef bint little_endian = ((&endian_detector)[0] != 0) # <<<<<<<<<<<<<< @@ -6661,7 +6739,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc */ __pyx_v_little_endian = ((((char *)(&__pyx_v_endian_detector))[0]) != 0); - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":701 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":701 * cdef tuple fields * * for childname in descr.names: # <<<<<<<<<<<<<< @@ -6680,7 +6758,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc __pyx_v_childname = __pyx_t_3; __pyx_t_3 = 0; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":702 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":702 * * for childname in descr.names: * fields = descr.fields[childname] # <<<<<<<<<<<<<< @@ -6694,7 +6772,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc __pyx_v_fields = ((PyObject *)__pyx_1); __pyx_1 = 0; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":703 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":703 * for childname in descr.names: * fields = descr.fields[childname] * child, new_offset = fields # <<<<<<<<<<<<<< @@ -6717,7 +6795,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc {__pyx_filename = __pyx_f[1]; __pyx_lineno = 703; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":705 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":705 * child, new_offset = fields * * if (end - f) - (new_offset - offset[0]) < 15: # <<<<<<<<<<<<<< @@ -6742,7 +6820,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; if (__pyx_t_6) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":706 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":706 * * if (end - f) - (new_offset - offset[0]) < 15: * raise RuntimeError("Format string allocated too short, see comment in numpy.pxd") # <<<<<<<<<<<<<< @@ -6764,7 +6842,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc } __pyx_L5:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":708 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":708 * raise RuntimeError("Format string allocated too short, see comment in numpy.pxd") * * if ((child.byteorder == '>' and little_endian) or # <<<<<<<<<<<<<< @@ -6778,7 +6856,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc } if (!__pyx_t_6) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":709 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":709 * * if ((child.byteorder == '>' and little_endian) or * (child.byteorder == '<' and not little_endian)): # <<<<<<<<<<<<<< @@ -6796,7 +6874,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc } if (__pyx_t_8) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":710 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":710 * if ((child.byteorder == '>' and little_endian) or * (child.byteorder == '<' and not little_endian)): * raise ValueError("Non-native byte order not supported") # <<<<<<<<<<<<<< @@ -6818,7 +6896,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc } __pyx_L6:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":720 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":720 * * # Output padding bytes * while offset[0] < new_offset: # <<<<<<<<<<<<<< @@ -6835,7 +6913,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; if (!__pyx_t_8) break; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":721 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":721 * # Output padding bytes * while offset[0] < new_offset: * f[0] = 120 # "x"; pad byte # <<<<<<<<<<<<<< @@ -6844,7 +6922,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc */ (__pyx_v_f[0]) = 120; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":722 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":722 * while offset[0] < new_offset: * f[0] = 120 # "x"; pad byte * f += 1 # <<<<<<<<<<<<<< @@ -6853,7 +6931,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc */ __pyx_v_f += 1; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":723 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":723 * f[0] = 120 # "x"; pad byte * f += 1 * offset[0] += 1 # <<<<<<<<<<<<<< @@ -6863,7 +6941,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc (__pyx_v_offset[0]) += 1; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":725 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":725 * offset[0] += 1 * * offset[0] += child.itemsize # <<<<<<<<<<<<<< @@ -6872,7 +6950,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc */ (__pyx_v_offset[0]) += __pyx_v_child->elsize; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":727 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":727 * offset[0] += child.itemsize * * if not PyDataType_HASFIELDS(child): # <<<<<<<<<<<<<< @@ -6882,7 +6960,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc __pyx_t_8 = (!PyDataType_HASFIELDS(__pyx_v_child)); if (__pyx_t_8) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":728 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":728 * * if not PyDataType_HASFIELDS(child): * t = child.type_num # <<<<<<<<<<<<<< @@ -6895,7 +6973,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc __pyx_v_t = __pyx_t_4; __pyx_t_4 = 0; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":729 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":729 * if not PyDataType_HASFIELDS(child): * t = child.type_num * if end - f < 5: # <<<<<<<<<<<<<< @@ -6905,7 +6983,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc __pyx_t_8 = ((__pyx_v_end - __pyx_v_f) < 5); if (__pyx_t_8) { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":730 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":730 * t = child.type_num * if end - f < 5: * raise RuntimeError("Format string allocated too short.") # <<<<<<<<<<<<<< @@ -6927,7 +7005,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc } __pyx_L10:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":733 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":733 * * # Until ticket #99 is fixed, use integers to avoid warnings * if t == NPY_BYTE: f[0] = 98 #"b" # <<<<<<<<<<<<<< @@ -6946,7 +7024,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":734 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":734 * # Until ticket #99 is fixed, use integers to avoid warnings * if t == NPY_BYTE: f[0] = 98 #"b" * elif t == NPY_UBYTE: f[0] = 66 #"B" # <<<<<<<<<<<<<< @@ -6965,7 +7043,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":735 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":735 * if t == NPY_BYTE: f[0] = 98 #"b" * elif t == NPY_UBYTE: f[0] = 66 #"B" * elif t == NPY_SHORT: f[0] = 104 #"h" # <<<<<<<<<<<<<< @@ -6984,7 +7062,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":736 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":736 * elif t == NPY_UBYTE: f[0] = 66 #"B" * elif t == NPY_SHORT: f[0] = 104 #"h" * elif t == NPY_USHORT: f[0] = 72 #"H" # <<<<<<<<<<<<<< @@ -7003,7 +7081,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":737 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":737 * elif t == NPY_SHORT: f[0] = 104 #"h" * elif t == NPY_USHORT: f[0] = 72 #"H" * elif t == NPY_INT: f[0] = 105 #"i" # <<<<<<<<<<<<<< @@ -7022,7 +7100,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":738 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":738 * elif t == NPY_USHORT: f[0] = 72 #"H" * elif t == NPY_INT: f[0] = 105 #"i" * elif t == NPY_UINT: f[0] = 73 #"I" # <<<<<<<<<<<<<< @@ -7041,7 +7119,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":739 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":739 * elif t == NPY_INT: f[0] = 105 #"i" * elif t == NPY_UINT: f[0] = 73 #"I" * elif t == NPY_LONG: f[0] = 108 #"l" # <<<<<<<<<<<<<< @@ -7060,7 +7138,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":740 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":740 * elif t == NPY_UINT: f[0] = 73 #"I" * elif t == NPY_LONG: f[0] = 108 #"l" * elif t == NPY_ULONG: f[0] = 76 #"L" # <<<<<<<<<<<<<< @@ -7079,7 +7157,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":741 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":741 * elif t == NPY_LONG: f[0] = 108 #"l" * elif t == NPY_ULONG: f[0] = 76 #"L" * elif t == NPY_LONGLONG: f[0] = 113 #"q" # <<<<<<<<<<<<<< @@ -7098,7 +7176,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":742 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":742 * elif t == NPY_ULONG: f[0] = 76 #"L" * elif t == NPY_LONGLONG: f[0] = 113 #"q" * elif t == NPY_ULONGLONG: f[0] = 81 #"Q" # <<<<<<<<<<<<<< @@ -7117,7 +7195,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":743 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":743 * elif t == NPY_LONGLONG: f[0] = 113 #"q" * elif t == NPY_ULONGLONG: f[0] = 81 #"Q" * elif t == NPY_FLOAT: f[0] = 102 #"f" # <<<<<<<<<<<<<< @@ -7136,7 +7214,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":744 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":744 * elif t == NPY_ULONGLONG: f[0] = 81 #"Q" * elif t == NPY_FLOAT: f[0] = 102 #"f" * elif t == NPY_DOUBLE: f[0] = 100 #"d" # <<<<<<<<<<<<<< @@ -7155,7 +7233,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":745 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":745 * elif t == NPY_FLOAT: f[0] = 102 #"f" * elif t == NPY_DOUBLE: f[0] = 100 #"d" * elif t == NPY_LONGDOUBLE: f[0] = 103 #"g" # <<<<<<<<<<<<<< @@ -7174,7 +7252,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":746 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":746 * elif t == NPY_DOUBLE: f[0] = 100 #"d" * elif t == NPY_LONGDOUBLE: f[0] = 103 #"g" * elif t == NPY_CFLOAT: f[0] = 90; f[1] = 102; f += 1 # Zf # <<<<<<<<<<<<<< @@ -7195,7 +7273,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":747 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":747 * elif t == NPY_LONGDOUBLE: f[0] = 103 #"g" * elif t == NPY_CFLOAT: f[0] = 90; f[1] = 102; f += 1 # Zf * elif t == NPY_CDOUBLE: f[0] = 90; f[1] = 100; f += 1 # Zd # <<<<<<<<<<<<<< @@ -7216,7 +7294,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":748 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":748 * elif t == NPY_CFLOAT: f[0] = 90; f[1] = 102; f += 1 # Zf * elif t == NPY_CDOUBLE: f[0] = 90; f[1] = 100; f += 1 # Zd * elif t == NPY_CLONGDOUBLE: f[0] = 90; f[1] = 103; f += 1 # Zg # <<<<<<<<<<<<<< @@ -7237,7 +7315,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc goto __pyx_L11; } - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":749 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":749 * elif t == NPY_CDOUBLE: f[0] = 90; f[1] = 100; f += 1 # Zd * elif t == NPY_CLONGDOUBLE: f[0] = 90; f[1] = 103; f += 1 # Zg * elif t == NPY_OBJECT: f[0] = 79 #"O" # <<<<<<<<<<<<<< @@ -7257,7 +7335,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc } /*else*/ { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":751 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":751 * elif t == NPY_OBJECT: f[0] = 79 #"O" * else: * raise ValueError("unknown dtype code in numpy.pxd (%d)" % t) # <<<<<<<<<<<<<< @@ -7280,7 +7358,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc } __pyx_L11:; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":752 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":752 * else: * raise ValueError("unknown dtype code in numpy.pxd (%d)" % t) * f += 1 # <<<<<<<<<<<<<< @@ -7292,7 +7370,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc } /*else*/ { - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":756 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":756 * # Cython ignores struct boundary information ("T{...}"), * # so don't output it * f = _util_dtypestring(child, f, end, offset) # <<<<<<<<<<<<<< @@ -7306,7 +7384,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc } __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/numpy.pxd":757 + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":757 * # so don't output it * f = _util_dtypestring(child, f, end, offset) * return f # <<<<<<<<<<<<<< @@ -7338,8 +7416,6 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc } static struct PyMethodDef __pyx_methods[] = { - {__Pyx_NAMESTR("cvFindChessboardCorners"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCorners, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCorners)}, - {__Pyx_NAMESTR("cvDrawChessboardCorners"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCorners, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCorners)}, {__Pyx_NAMESTR("cvSobel"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvSobel)}, {__Pyx_NAMESTR("cvLaplace"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvLaplace)}, {__Pyx_NAMESTR("cvCanny"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvCanny)}, @@ -7351,6 +7427,8 @@ static struct PyMethodDef __pyx_methods[] = { {__Pyx_NAMESTR("cvSmooth"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvSmooth)}, {__Pyx_NAMESTR("cvGoodFeaturesToTrack"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTrack, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTrack)}, {__Pyx_NAMESTR("cvResize"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvResize)}, + {__Pyx_NAMESTR("cvFindChessboardCorners"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCorners, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCorners)}, + {__Pyx_NAMESTR("cvDrawChessboardCorners"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCorners, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCorners)}, {0, 0, 0, 0} }; @@ -7404,7 +7482,7 @@ static int __pyx_import_star_set(PyObject *o, PyObject* py_name, char *name) { if (0); else if (__Pyx_StrEq(name, "c_cvSmooth")) { PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvSmooth to scikits.image.opencv.opencv_cv.cvSmoothPtr"); - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L2_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L2_error;} } else if (__Pyx_StrEq(name, "c_cvCanny")) { PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvCanny to scikits.image.opencv.opencv_cv.cvCannyPtr"); @@ -7416,15 +7494,15 @@ static int __pyx_import_star_set(PyObject *o, PyObject* py_name, char *name) { } else if (__Pyx_StrEq(name, "c_cvFindChessboardCorners")) { PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvFindChessboardCorners to scikits.image.opencv.opencv_cv.cvFindChessboardCornersPtr"); - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L2_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L2_error;} } else if (__Pyx_StrEq(name, "c_cvResize")) { PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvResize to scikits.image.opencv.opencv_cv.cvResizePtr"); - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L2_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L2_error;} } else if (__Pyx_StrEq(name, "c_cvGoodFeaturesToTrack")) { PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvGoodFeaturesToTrack to scikits.image.opencv.opencv_cv.cvGoodFeaturesToTrackPtr"); - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L2_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L2_error;} } else if (__Pyx_StrEq(name, "c_cvCornerEigenValsAndVecs")) { PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvCornerEigenValsAndVecs to scikits.image.opencv.opencv_cv.cvCornerEigenValsAndVecsPtr"); @@ -7448,11 +7526,11 @@ static int __pyx_import_star_set(PyObject *o, PyObject* py_name, char *name) { } else if (__Pyx_StrEq(name, "c_cvDrawChessboardCorners")) { PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvDrawChessboardCorners to scikits.image.opencv.opencv_cv.cvDrawChessboardCornersPtr"); - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L2_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L2_error;} } else if (__Pyx_StrEq(name, "c_cvFindCornerSubPix")) { PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvFindCornerSubPix to scikits.image.opencv.opencv_cv.cvFindCornerSubPixPtr"); - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L2_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L2_error;} } else { if (PyObject_SetAttr(__pyx_m, py_name, o) < 0) goto bad; @@ -7584,10 +7662,7 @@ static struct PyModuleDef __pyx_moduledef = { static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_kp___main__, __pyx_k___main__, sizeof(__pyx_k___main__), 1, 1, 1}, {&__pyx_kp_src, __pyx_k_src, sizeof(__pyx_k_src), 1, 1, 1}, - {&__pyx_kp_pattern_size, __pyx_k_pattern_size, sizeof(__pyx_k_pattern_size), 1, 1, 1}, - {&__pyx_kp_flags, __pyx_k_flags, sizeof(__pyx_k_flags), 1, 1, 1}, {&__pyx_kp_out, __pyx_k_out, sizeof(__pyx_k_out), 1, 1, 1}, - {&__pyx_kp_corners, __pyx_k_corners, sizeof(__pyx_k_corners), 1, 1, 1}, {&__pyx_kp_xorder, __pyx_k_xorder, sizeof(__pyx_k_xorder), 1, 1, 1}, {&__pyx_kp_yorder, __pyx_k_yorder, sizeof(__pyx_k_yorder), 1, 1, 1}, {&__pyx_kp_aperture_size, __pyx_k_aperture_size, sizeof(__pyx_k_aperture_size), 1, 1, 1}, @@ -7595,6 +7670,7 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_kp_32, __pyx_k_32, sizeof(__pyx_k_32), 1, 1, 1}, {&__pyx_kp_block_size, __pyx_k_block_size, sizeof(__pyx_k_block_size), 1, 1, 1}, {&__pyx_kp_k, __pyx_k_k, sizeof(__pyx_k_k), 1, 1, 1}, + {&__pyx_kp_corners, __pyx_k_corners, sizeof(__pyx_k_corners), 1, 1, 1}, {&__pyx_kp_count, __pyx_k_count, sizeof(__pyx_k_count), 1, 1, 1}, {&__pyx_kp_win, __pyx_k_win, sizeof(__pyx_k_win), 1, 1, 1}, {&__pyx_kp_zero_zone, __pyx_k_zero_zone, sizeof(__pyx_k_zero_zone), 1, 1, 1}, @@ -7614,6 +7690,8 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_kp_height, __pyx_k_height, sizeof(__pyx_k_height), 1, 1, 1}, {&__pyx_kp_width, __pyx_k_width, sizeof(__pyx_k_width), 1, 1, 1}, {&__pyx_kp_method, __pyx_k_method, sizeof(__pyx_k_method), 1, 1, 1}, + {&__pyx_kp_pattern_size, __pyx_k_pattern_size, sizeof(__pyx_k_pattern_size), 1, 1, 1}, + {&__pyx_kp_flags, __pyx_k_flags, sizeof(__pyx_k_flags), 1, 1, 1}, {&__pyx_kp_ctypes, __pyx_k_ctypes, sizeof(__pyx_k_ctypes), 1, 1, 1}, {&__pyx_kp_numpy, __pyx_k_numpy, sizeof(__pyx_k_numpy), 1, 1, 1}, {&__pyx_kp_np, __pyx_k_np, sizeof(__pyx_k_np), 0, 1, 1}, @@ -7632,28 +7710,27 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_kp_cvCornerMinEigenVal, __pyx_k_cvCornerMinEigenVal, sizeof(__pyx_k_cvCornerMinEigenVal), 1, 1, 1}, {&__pyx_kp_cvCornerHarris, __pyx_k_cvCornerHarris, sizeof(__pyx_k_cvCornerHarris), 1, 1, 1}, {&__pyx_kp_cvFindCornerSubPix, __pyx_k_cvFindCornerSubPix, sizeof(__pyx_k_cvFindCornerSubPix), 1, 1, 1}, - {&__pyx_kp_39, __pyx_k_39, sizeof(__pyx_k_39), 1, 1, 1}, - {&__pyx_kp_40, __pyx_k_40, sizeof(__pyx_k_40), 1, 1, 1}, {&__pyx_kp_cvSmooth, __pyx_k_cvSmooth, sizeof(__pyx_k_cvSmooth), 1, 1, 1}, - {&__pyx_kp_41, __pyx_k_41, sizeof(__pyx_k_41), 1, 1, 1}, + {&__pyx_kp_39, __pyx_k_39, sizeof(__pyx_k_39), 1, 1, 1}, {&__pyx_kp_cvResize, __pyx_k_cvResize, sizeof(__pyx_k_cvResize), 1, 1, 1}, - {&__pyx_kp_42, __pyx_k_42, sizeof(__pyx_k_42), 1, 1, 1}, + {&__pyx_kp_40, __pyx_k_40, sizeof(__pyx_k_40), 1, 1, 1}, + {&__pyx_kp_41, __pyx_k_41, sizeof(__pyx_k_41), 1, 1, 1}, {&__pyx_kp_CV_GAUSSIAN, __pyx_k_CV_GAUSSIAN, sizeof(__pyx_k_CV_GAUSSIAN), 1, 1, 1}, {&__pyx_kp_CV_INTER_LINEAR, __pyx_k_CV_INTER_LINEAR, sizeof(__pyx_k_CV_INTER_LINEAR), 1, 1, 1}, - {&__pyx_kp_48, __pyx_k_48, sizeof(__pyx_k_48), 1, 1, 1}, + {&__pyx_kp_46, __pyx_k_46, sizeof(__pyx_k_46), 1, 1, 1}, {&__pyx_kp_49, __pyx_k_49, sizeof(__pyx_k_49), 1, 1, 1}, {&__pyx_kp_50, __pyx_k_50, sizeof(__pyx_k_50), 1, 1, 1}, + {&__pyx_kp_51, __pyx_k_51, sizeof(__pyx_k_51), 1, 1, 1}, {&__pyx_kp_ValueError, __pyx_k_ValueError, sizeof(__pyx_k_ValueError), 1, 1, 1}, {&__pyx_kp_dtype, __pyx_k_dtype, sizeof(__pyx_k_dtype), 1, 1, 1}, - {&__pyx_kp_52, __pyx_k_52, sizeof(__pyx_k_52), 1, 1, 1}, + {&__pyx_kp_53, __pyx_k_53, sizeof(__pyx_k_53), 1, 1, 1}, {&__pyx_kp_reshape, __pyx_k_reshape, sizeof(__pyx_k_reshape), 1, 1, 1}, {&__pyx_kp_shape, __pyx_k_shape, sizeof(__pyx_k_shape), 1, 1, 1}, {&__pyx_kp_CV_BLUR_NO_SCALE, __pyx_k_CV_BLUR_NO_SCALE, sizeof(__pyx_k_CV_BLUR_NO_SCALE), 1, 1, 1}, {&__pyx_kp_RuntimeError, __pyx_k_RuntimeError, sizeof(__pyx_k_RuntimeError), 1, 1, 1}, {&__pyx_kp_CV_BLUR, __pyx_k_CV_BLUR, sizeof(__pyx_k_CV_BLUR), 1, 1, 1}, - {&__pyx_kp_range, __pyx_k_range, sizeof(__pyx_k_range), 1, 1, 1}, - {&__pyx_kp_51, __pyx_k_51, sizeof(__pyx_k_51), 0, 0, 0}, - {&__pyx_kp_53, __pyx_k_53, sizeof(__pyx_k_53), 0, 0, 0}, + {&__pyx_kp_copy, __pyx_k_copy, sizeof(__pyx_k_copy), 1, 1, 1}, + {&__pyx_kp_52, __pyx_k_52, sizeof(__pyx_k_52), 0, 0, 0}, {&__pyx_kp_54, __pyx_k_54, sizeof(__pyx_k_54), 0, 0, 0}, {&__pyx_kp_55, __pyx_k_55, sizeof(__pyx_k_55), 0, 0, 0}, {&__pyx_kp_56, __pyx_k_56, sizeof(__pyx_k_56), 0, 0, 0}, @@ -7663,9 +7740,11 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_kp_60, __pyx_k_60, sizeof(__pyx_k_60), 0, 0, 0}, {&__pyx_kp_61, __pyx_k_61, sizeof(__pyx_k_61), 0, 0, 0}, {&__pyx_kp_62, __pyx_k_62, sizeof(__pyx_k_62), 0, 0, 0}, + {&__pyx_kp_63, __pyx_k_63, sizeof(__pyx_k_63), 0, 0, 0}, {&__pyx_kp___getbuffer__, __pyx_k___getbuffer__, sizeof(__pyx_k___getbuffer__), 1, 1, 1}, {&__pyx_kp___releasebuffer__, __pyx_k___releasebuffer__, sizeof(__pyx_k___releasebuffer__), 1, 1, 1}, {&__pyx_kp_info, __pyx_k_info, sizeof(__pyx_k_info), 1, 1, 1}, + {&__pyx_kp_range, __pyx_k_range, sizeof(__pyx_k_range), 1, 1, 1}, {&__pyx_kp_1, __pyx_k_1, sizeof(__pyx_k_1), 0, 0, 0}, {&__pyx_kp_2, __pyx_k_2, sizeof(__pyx_k_2), 0, 0, 0}, {&__pyx_kp_5, __pyx_k_5, sizeof(__pyx_k_5), 0, 0, 0}, @@ -7677,9 +7756,9 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {0, 0, 0, 0, 0, 0} }; static int __Pyx_InitCachedBuiltins(void) { - __pyx_builtin_ValueError = __Pyx_GetName(__pyx_b, __pyx_kp_ValueError); if (!__pyx_builtin_ValueError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_builtin_RuntimeError = __Pyx_GetName(__pyx_b, __pyx_kp_RuntimeError); if (!__pyx_builtin_RuntimeError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 474; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_builtin_range = __Pyx_GetName(__pyx_b, __pyx_kp_range); if (!__pyx_builtin_range) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 584; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_builtin_ValueError = __Pyx_GetName(__pyx_b, __pyx_kp_ValueError); if (!__pyx_builtin_ValueError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_builtin_RuntimeError = __Pyx_GetName(__pyx_b, __pyx_kp_RuntimeError); if (!__pyx_builtin_RuntimeError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 414; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_builtin_range = __Pyx_GetName(__pyx_b, __pyx_kp_range); if (!__pyx_builtin_range) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 183; __pyx_clineno = __LINE__; goto __pyx_L1_error;} return 0; __pyx_L1_error:; return -1; @@ -7688,10 +7767,9 @@ static int __Pyx_InitCachedBuiltins(void) { static int __Pyx_InitGlobals(void) { __pyx_int_neg_1 = PyInt_FromLong(-1); if (unlikely(!__pyx_int_neg_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; __pyx_int_1 = PyInt_FromLong(1); if (unlikely(!__pyx_int_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; - __pyx_int_3 = PyInt_FromLong(3); if (unlikely(!__pyx_int_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; __pyx_int_6 = PyInt_FromLong(6); if (unlikely(!__pyx_int_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; __pyx_int_2 = PyInt_FromLong(2); if (unlikely(!__pyx_int_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; - __pyx_int_0 = PyInt_FromLong(0); if (unlikely(!__pyx_int_0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_int_3 = PyInt_FromLong(3); if (unlikely(!__pyx_int_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; __pyx_int_15 = PyInt_FromLong(15); if (unlikely(!__pyx_int_15)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; return 0; @@ -7790,7 +7868,7 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) Py_DECREF(__pyx_2); __pyx_2 = 0; /*--- Execution code ---*/ - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1 * import ctypes # <<<<<<<<<<<<<< * import numpy as np * cimport numpy as np @@ -7800,7 +7878,7 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) if (PyObject_SetAttr(__pyx_m, __pyx_kp_ctypes, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":2 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":2 * import ctypes * import numpy as np # <<<<<<<<<<<<<< * cimport numpy as np @@ -7811,7 +7889,7 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) if (PyObject_SetAttr(__pyx_m, __pyx_kp_np, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":7 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":7 * #from stdlib cimport * * from opencv_type cimport * * from opencv_backend import * # <<<<<<<<<<<<<< @@ -7829,7 +7907,7 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) if (__pyx_import_star(__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":9 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":9 * from opencv_backend import * * from opencv_backend cimport * * from opencv_constants import * # <<<<<<<<<<<<<< @@ -7847,7 +7925,7 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) if (__pyx_import_star(__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":11 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":11 * from opencv_constants import * * * from opencv_constants import * # <<<<<<<<<<<<<< @@ -7865,7 +7943,7 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) if (__pyx_import_star(__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":12 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":12 * * from opencv_constants import * * from opencv_cv import * # <<<<<<<<<<<<<< @@ -7883,7 +7961,7 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) if (__pyx_import_star(__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":14 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":14 * from opencv_cv import * * * from _libimport import cv # <<<<<<<<<<<<<< @@ -7904,7 +7982,7 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) __Pyx_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":23 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":23 * ctypedef void (*cvSobelPtr)(IplImage*, IplImage*, int, int, int) * cdef cvSobelPtr c_cvSobel * c_cvSobel = (ctypes.addressof(cv.cvSobel))[0] # <<<<<<<<<<<<<< @@ -7934,7 +8012,7 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvSobel = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvSobelPtr *)((size_t)__pyx_t_4))[0]); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":28 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":28 * ctypedef void (*cvLaplacePtr)(IplImage*, IplImage*, int) * cdef cvLaplacePtr c_cvLaplace * c_cvLaplace = (ctypes.addressof(cv.cvLaplace))[0] # <<<<<<<<<<<<<< @@ -7964,7 +8042,7 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvLaplace = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvLaplacePtr *)((size_t)__pyx_t_4))[0]); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":33 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":33 * ctypedef void (*cvCannyPtr)(IplImage*, IplImage*, double, double, int) * cdef cvCannyPtr c_cvCanny * c_cvCanny = (ctypes.addressof(cv.cvCanny))[0] # <<<<<<<<<<<<<< @@ -7994,7 +8072,7 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCanny = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCannyPtr *)((size_t)__pyx_t_4))[0]); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":39 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":39 * cdef cvPreCorneDetectPtr c_cvPreCornerDetect * c_cvPreCornerDetect = ( * ctypes.addressof(cv.cvPreCornerDetect))[0] # <<<<<<<<<<<<<< @@ -8024,7 +8102,7 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvPreCornerDetect = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvPreCorneDetectPtr *)((size_t)__pyx_t_4))[0]); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":45 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":45 * cdef cvCornerEigenValsAndVecsPtr c_cvCornerEigenValsAndVecs * c_cvCornerEigenValsAndVecs = ( * ctypes.addressof(cv.cvCornerEigenValsAndVecs))[0] # <<<<<<<<<<<<<< @@ -8054,7 +8132,7 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCornerEigenValsAndVecs = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAndVecsPtr *)((size_t)__pyx_t_4))[0]); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":51 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":51 * cdef cvCornerMinEigenValPtr c_cvCornerMinEigenVal * c_cvCornerMinEigenVal = ( * ctypes.addressof(cv.cvCornerMinEigenVal))[0] # <<<<<<<<<<<<<< @@ -8084,12 +8162,12 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCornerMinEigenVal = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenValPtr *)((size_t)__pyx_t_4))[0]); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":57 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":57 * cdef cvCornerHarrisPtr c_cvCornerHarris * c_cvCornerHarris = ( * ctypes.addressof(cv.cvCornerHarris))[0] # <<<<<<<<<<<<<< * - * + * # cvFindCornerSubPix */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); @@ -8114,42 +8192,42 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCornerHarris = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCornerHarrisPtr *)((size_t)__pyx_t_4))[0]); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":65 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":64 * cdef cvFindCornerSubPixPtr c_cvFindCornerSubPix * c_cvFindCornerSubPix = ( * ctypes.addressof(cv.cvFindCornerSubPix))[0] # <<<<<<<<<<<<<< * - * # cvFindChessboardCorners + * # cvSmooth */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_2 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_t_3 = PyObject_GetAttr(__pyx_2, __pyx_kp_cvFindCornerSubPix); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_GetAttr(__pyx_2, __pyx_kp_cvFindCornerSubPix); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_1)); PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_3); __Pyx_GIVEREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0; - __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_3); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_3); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvFindCornerSubPix = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPixPtr *)((size_t)__pyx_t_4))[0]); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":70 - * ctypedef void (*cvFindChessboardCornersPtr)(IplImage*, CvSize, CvPoint2D32f*, int*, int) - * cdef cvFindChessboardCornersPtr c_cvFindChessboardCorners - * c_cvFindChessboardCorners = (ctypes.addressof(cv.cvFindChessboardCorners))[0] # <<<<<<<<<<<<<< + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":70 + * int, double, double) + * cdef cvSmoothPtr c_cvSmooth + * c_cvSmooth = (ctypes.addressof(cv.cvSmooth))[0] # <<<<<<<<<<<<<< * - * # cvDrawChessboardCorners + * # cvGoodFeaturesToTrack */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); @@ -8158,7 +8236,7 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_t_1 = PyObject_GetAttr(__pyx_2, __pyx_kp_39); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_GetAttr(__pyx_2, __pyx_kp_cvSmooth); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_2); __pyx_2 = 0; __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} @@ -8172,74 +8250,74 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_1); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvFindChessboardCorners = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCornersPtr *)((size_t)__pyx_t_4))[0]); + __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvSmooth = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvSmoothPtr *)((size_t)__pyx_t_4))[0]); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":75 - * ctypedef void (*cvDrawChessboardCornersPtr)(IplImage*, CvSize, CvPoint2D32f*, int, int) - * cdef cvDrawChessboardCornersPtr c_cvDrawChessboardCorners - * c_cvDrawChessboardCorners = (ctypes.addressof(cv.cvDrawChessboardCorners))[0] # <<<<<<<<<<<<<< - * - * # cvSmooth + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":78 + * cdef cvGoodFeaturesToTrackPtr c_cvGoodFeaturesToTrack + * c_cvGoodFeaturesToTrack = ( + * ctypes.addressof(cv.cvGoodFeaturesToTrack))[0] # <<<<<<<<<<<<<< + * # cvResize + * ctypedef void (*cvResizePtr)(IplImage*, IplImage*, int) */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_1 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_t_2 = PyObject_GetAttr(__pyx_2, __pyx_kp_40); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(__pyx_2, __pyx_kp_39); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_3)); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; - __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_2); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_2); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvDrawChessboardCorners = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCornersPtr *)((size_t)__pyx_t_4))[0]); + __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvGoodFeaturesToTrack = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTrackPtr *)((size_t)__pyx_t_4))[0]); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":81 - * int, double, double) - * cdef cvSmoothPtr c_cvSmooth - * c_cvSmooth = (ctypes.addressof(cv.cvSmooth))[0] # <<<<<<<<<<<<<< + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":82 + * ctypedef void (*cvResizePtr)(IplImage*, IplImage*, int) + * cdef cvResizePtr c_cvResize + * c_cvResize = (ctypes.addressof(cv.cvResize))[0] # <<<<<<<<<<<<<< * - * # cvGoodFeaturesToTrack + * # cvFindChessboardCorners */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_2 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_t_3 = PyObject_GetAttr(__pyx_2, __pyx_kp_cvSmooth); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_GetAttr(__pyx_2, __pyx_kp_cvResize); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_1)); PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_3); __Pyx_GIVEREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0; - __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_3); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_3); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvSmooth = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvSmoothPtr *)((size_t)__pyx_t_4))[0]); + __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvResize = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvResizePtr *)((size_t)__pyx_t_4))[0]); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":89 - * cdef cvGoodFeaturesToTrackPtr c_cvGoodFeaturesToTrack - * c_cvGoodFeaturesToTrack = ( - * ctypes.addressof(cv.cvGoodFeaturesToTrack))[0] # <<<<<<<<<<<<<< + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":89 + * cdef cvFindChessboardCornersPtr c_cvFindChessboardCorners + * c_cvFindChessboardCorners = ( + * ctypes.addressof(cv.cvFindChessboardCorners))[0] # <<<<<<<<<<<<<< * - * # cvResize + * # cvDrawChessboardCorners */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 89; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); @@ -8248,7 +8326,7 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 89; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_t_1 = PyObject_GetAttr(__pyx_2, __pyx_kp_41); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 89; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_GetAttr(__pyx_2, __pyx_kp_40); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 89; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_2); __pyx_2 = 0; __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 89; __pyx_clineno = __LINE__; goto __pyx_L1_error;} @@ -8262,59 +8340,46 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_1); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 89; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvGoodFeaturesToTrack = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTrackPtr *)((size_t)__pyx_t_4))[0]); + __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvFindChessboardCorners = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCornersPtr *)((size_t)__pyx_t_4))[0]); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":94 - * ctypedef void (*cvResizePtr)(IplImage*, IplImage*, int) - * cdef cvResizePtr c_cvResize - * c_cvResize = (ctypes.addressof(cv.cvResize))[0] # <<<<<<<<<<<<<< + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":96 + * cdef cvDrawChessboardCornersPtr c_cvDrawChessboardCorners + * c_cvDrawChessboardCorners = ( + * ctypes.addressof(cv.cvDrawChessboardCorners))[0] # <<<<<<<<<<<<<< * * */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_1 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_t_2 = PyObject_GetAttr(__pyx_2, __pyx_kp_cvResize); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(__pyx_2, __pyx_kp_41); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_3)); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; - __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_2); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_2); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvResize = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvResizePtr *)((size_t)__pyx_t_4))[0]); + __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvDrawChessboardCorners = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCornersPtr *)((size_t)__pyx_t_4))[0]); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":100 - * # Function Implementations - * #################################### - * def cvFindChessboardCorners(np.ndarray src, pattern_size, int flags = CV_CALIB_CB_ADAPTIVE_THRESH): # <<<<<<<<<<<<<< - * """ - * Wrapper around the OpenCV cvFindChessboardCorners function. - */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_42); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_1); - __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_k_43 = __pyx_t_5; - - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":405 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":345 * * def cvFindCornerSubPix(np.ndarray src, np.ndarray corners, int count, win, * zero_zone=(-1, -1), int iterations=0, # <<<<<<<<<<<<<< * double epsilon=1e-5): * */ - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 405; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 345; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_int_neg_1); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_int_neg_1); @@ -8322,50 +8387,76 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) __Pyx_INCREF(__pyx_int_neg_1); PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_int_neg_1); __Pyx_GIVEREF(__pyx_int_neg_1); - __pyx_k_44 = ((PyObject *)__pyx_t_2); + __pyx_k_42 = ((PyObject *)__pyx_t_2); __pyx_t_2 = 0; - __Pyx_GIVEREF(__pyx_k_44); + __Pyx_GIVEREF(__pyx_k_42); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":454 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":394 * * def cvSmooth(np.ndarray src, np.ndarray out=None, * int smoothtype=CV_GAUSSIAN, int param1=3, # <<<<<<<<<<<<<< * int param2=0, double param3=0, double param4=0, * bool in_place=False): */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_GAUSSIAN); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 454; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_2); - __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_2); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 454; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_k_45 = __pyx_t_5; + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_GAUSSIAN); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 394; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_1); + __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 394; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_1); __pyx_1 = 0; + __pyx_k_43 = __pyx_t_5; - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":456 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":396 * int smoothtype=CV_GAUSSIAN, int param1=3, * int param2=0, double param3=0, double param4=0, * bool in_place=False): # <<<<<<<<<<<<<< * """ * better doc string needed. */ - __pyx_t_2 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 456; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 396; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - if (!(likely(PyBool_Check(__pyx_t_2)) || (__pyx_t_2) == Py_None || (PyErr_Format(PyExc_TypeError, "Expected bool, got %s", Py_TYPE(__pyx_t_2)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 456; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_k_46 = ((PyObject *)__pyx_t_2); - __Pyx_GIVEREF(__pyx_k_46); + if (!(likely(PyBool_Check(__pyx_t_2)) || (__pyx_t_2) == Py_None || (PyErr_Format(PyExc_TypeError, "Expected bool, got %s", Py_TYPE(__pyx_t_2)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 396; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_k_44 = ((PyObject *)__pyx_t_2); + __Pyx_GIVEREF(__pyx_k_44); - /* "/Users/rapp/Desktop/Promotion/prog/scikit_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":594 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":518 * * def cvResize(np.ndarray src, height=None, width=None, * int method=CV_INTER_LINEAR): # <<<<<<<<<<<<<< * """ * better doc string needed. */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_INTER_LINEAR); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 594; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_INTER_LINEAR); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 518; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_2); + __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_2); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 518; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_2); __pyx_2 = 0; + __pyx_k_45 = __pyx_t_5; + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":549 + * + * def cvFindChessboardCorners(np.ndarray src, pattern_size, + * int flags = CV_CALIB_CB_ADAPTIVE_THRESH): # <<<<<<<<<<<<<< + * """ + * Wrapper around the OpenCV cvFindChessboardCorners function. + */ + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_46); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 549; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 594; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 549; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_k_47 = __pyx_t_5; - /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython-0.11.3-py2.6-macosx-10.4-i386.egg/Cython/Includes/python_mem.pxd":1 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":584 + * + * def cvDrawChessboardCorners(np.ndarray src, pattern_size, np.ndarray corners, + * in_place=True): # <<<<<<<<<<<<<< + * """ + * Wrapper around the OpenCV cvDrawChessboardCorners function. + */ + __pyx_t_2 = __Pyx_PyBool_FromLong(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 584; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); + __pyx_k_48 = __pyx_t_2; + __pyx_t_2 = 0; + __Pyx_GIVEREF(__pyx_k_48); + + /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/python_mem.pxd":1 * cdef extern from "Python.h": # <<<<<<<<<<<<<< * * ##################################################################### @@ -8525,7 +8616,6 @@ bad: return -1; } - static int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type) { if (!type) { PyErr_Format(PyExc_SystemError, "Missing type object"); @@ -8538,6 +8628,7 @@ static int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type) { return 0; } + static INLINE void __Pyx_RaiseNoneNotIterableError(void) { PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable"); } @@ -8627,38 +8718,6 @@ static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name) { return result; } -static INLINE npy_intp __Pyx_PyInt_from_py_npy_intp(PyObject* x) { - /**/ if (sizeof(npy_intp) == sizeof(char)) - return (((npy_intp)-1) < ((npy_intp)0)) ? - (npy_intp)__Pyx_PyInt_AsSignedChar(x) : - (npy_intp)__Pyx_PyInt_AsUnsignedChar(x); - else if (sizeof(npy_intp) == sizeof(short)) - return (((npy_intp)-1) < ((npy_intp)0)) ? - (npy_intp)__Pyx_PyInt_AsSignedShort(x) : - (npy_intp)__Pyx_PyInt_AsUnsignedShort(x); - else if (sizeof(npy_intp) == sizeof(int)) - return (((npy_intp)-1) < ((npy_intp)0)) ? - (npy_intp)__Pyx_PyInt_AsSignedInt(x) : - (npy_intp)__Pyx_PyInt_AsUnsignedInt(x); - else if (sizeof(npy_intp) == sizeof(long)) - return (((npy_intp)-1) < ((npy_intp)0)) ? - (npy_intp)__Pyx_PyInt_AsSignedLong(x) : - (npy_intp)__Pyx_PyInt_AsUnsignedLong(x); - else if (sizeof(npy_intp) == sizeof(PY_LONG_LONG)) - return (((npy_intp)-1) < ((npy_intp)0)) ? - (npy_intp)__Pyx_PyInt_AsSignedLongLong(x) : - (npy_intp)__Pyx_PyInt_AsUnsignedLongLong(x); -#if 0 - else if (sizeof(npy_intp) > sizeof(short) && - sizeof(npy_intp) < sizeof(int)) /* __int32 ILP64 ? */ - return (((npy_intp)-1) < ((npy_intp)0)) ? - (npy_intp)__Pyx_PyInt_AsSignedInt(x) : - (npy_intp)__Pyx_PyInt_AsUnsignedInt(x); -#endif - PyErr_SetString(PyExc_TypeError, "npy_intp"); - return (npy_intp)-1; -} - static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb) { Py_XINCREF(type); Py_XINCREF(value); @@ -8767,6 +8826,51 @@ static INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject ** } +static INLINE npy_intp __Pyx_PyInt_from_py_npy_intp(PyObject* x) { + /**/ if (sizeof(npy_intp) == sizeof(char)) + return (((npy_intp)-1) < ((npy_intp)0)) ? + (npy_intp)__Pyx_PyInt_AsSignedChar(x) : + (npy_intp)__Pyx_PyInt_AsUnsignedChar(x); + else if (sizeof(npy_intp) == sizeof(short)) + return (((npy_intp)-1) < ((npy_intp)0)) ? + (npy_intp)__Pyx_PyInt_AsSignedShort(x) : + (npy_intp)__Pyx_PyInt_AsUnsignedShort(x); + else if (sizeof(npy_intp) == sizeof(int)) + return (((npy_intp)-1) < ((npy_intp)0)) ? + (npy_intp)__Pyx_PyInt_AsSignedInt(x) : + (npy_intp)__Pyx_PyInt_AsUnsignedInt(x); + else if (sizeof(npy_intp) == sizeof(long)) + return (((npy_intp)-1) < ((npy_intp)0)) ? + (npy_intp)__Pyx_PyInt_AsSignedLong(x) : + (npy_intp)__Pyx_PyInt_AsUnsignedLong(x); + else if (sizeof(npy_intp) == sizeof(PY_LONG_LONG)) + return (((npy_intp)-1) < ((npy_intp)0)) ? + (npy_intp)__Pyx_PyInt_AsSignedLongLong(x) : + (npy_intp)__Pyx_PyInt_AsUnsignedLongLong(x); +#if 0 + else if (sizeof(npy_intp) > sizeof(short) && + sizeof(npy_intp) < sizeof(int)) /* __int32 ILP64 ? */ + return (((npy_intp)-1) < ((npy_intp)0)) ? + (npy_intp)__Pyx_PyInt_AsSignedInt(x) : + (npy_intp)__Pyx_PyInt_AsUnsignedInt(x); +#endif + PyErr_SetString(PyExc_TypeError, "npy_intp"); + return (npy_intp)-1; +} + +static INLINE PyObject *__Pyx_PyInt_to_py_npy_intp(npy_intp val) { + /**/ if (sizeof(npy_intp) < sizeof(long)) + return PyInt_FromLong((long)val); + else if (sizeof(npy_intp) == sizeof(long)) + return (((npy_intp)-1) < ((npy_intp)0)) ? + PyInt_FromLong((long)val) : + PyLong_FromUnsignedLong((unsigned long)val); + else /* (sizeof(npy_intp) > sizeof(long)) */ + return (((npy_intp)-1) < ((npy_intp)0)) ? + PyLong_FromLongLong((PY_LONG_LONG)val) : + PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)val); +} + static PyObject *__Pyx_UnpackItem(PyObject *iter, Py_ssize_t index) { PyObject *item; if (!(item = PyIter_Next(iter))) { diff --git a/scikits/image/opencv/opencv_cv.pyx b/scikits/image/opencv/opencv_cv.pyx index 403b2f4e..2031b8dc 100644 --- a/scikits/image/opencv/opencv_cv.pyx +++ b/scikits/image/opencv/opencv_cv.pyx @@ -56,7 +56,6 @@ cdef cvCornerHarrisPtr c_cvCornerHarris c_cvCornerHarris = ( ctypes.addressof(cv.cvCornerHarris))[0] - # cvFindCornerSubPix ctypedef void (*cvFindCornerSubPixPtr)(IplImage*, CvPoint2D32f*, int, CvSize, CvSize, CvTermCriteria) @@ -64,16 +63,6 @@ cdef cvFindCornerSubPixPtr c_cvFindCornerSubPix c_cvFindCornerSubPix = ( ctypes.addressof(cv.cvFindCornerSubPix))[0] -# cvFindChessboardCorners -ctypedef void (*cvFindChessboardCornersPtr)(IplImage*, CvSize, CvPoint2D32f*, int*, int) -cdef cvFindChessboardCornersPtr c_cvFindChessboardCorners -c_cvFindChessboardCorners = (ctypes.addressof(cv.cvFindChessboardCorners))[0] - -# cvDrawChessboardCorners -ctypedef void (*cvDrawChessboardCornersPtr)(IplImage*, CvSize, CvPoint2D32f*, int, int) -cdef cvDrawChessboardCornersPtr c_cvDrawChessboardCorners -c_cvDrawChessboardCorners = (ctypes.addressof(cv.cvDrawChessboardCorners))[0] - # cvSmooth ctypedef void (*cvSmoothPtr)(IplImage*, IplImage*, int, int, int, double, double) @@ -87,79 +76,30 @@ ctypedef void (*cvGoodFeaturesToTrackPtr)(IplImage*, IplImage*, IplImage*, cdef cvGoodFeaturesToTrackPtr c_cvGoodFeaturesToTrack c_cvGoodFeaturesToTrack = ( ctypes.addressof(cv.cvGoodFeaturesToTrack))[0] - # cvResize ctypedef void (*cvResizePtr)(IplImage*, IplImage*, int) cdef cvResizePtr c_cvResize c_cvResize = (ctypes.addressof(cv.cvResize))[0] +# cvFindChessboardCorners +ctypedef void (*cvFindChessboardCornersPtr)(IplImage*, CvSize, CvPoint2D32f*, + int*, int) +cdef cvFindChessboardCornersPtr c_cvFindChessboardCorners +c_cvFindChessboardCorners = ( + ctypes.addressof(cv.cvFindChessboardCorners))[0] + +# cvDrawChessboardCorners +ctypedef void (*cvDrawChessboardCornersPtr)(IplImage*, CvSize, CvPoint2D32f*, + int, int) +cdef cvDrawChessboardCornersPtr c_cvDrawChessboardCorners +c_cvDrawChessboardCorners = ( + ctypes.addressof(cv.cvDrawChessboardCorners))[0] + #################################### # Function Implementations #################################### -def cvFindChessboardCorners(np.ndarray src, pattern_size, int flags = CV_CALIB_CB_ADAPTIVE_THRESH): - """ - Wrapper around the OpenCV cvFindChessboardCorners function. - src - Image to search for chessboard corners - pattern_size - Tuple of inner corners (w,h) - flags - directly passed through to OpenCV - """ - validate_array(src) - - assert_nchannels(src, [1, 3]) - assert_dtype(src, [UINT8]) - - cdef np.npy_intp outshape[2] - outshape[0] = pattern_size[1]*pattern_size[0] - outshape[1] = 2 # pattern_size[0] - - points = new_array(2, outshape, FLOAT32) - cdef CvPoint2D32f* cvpoints = array_as_cvPoint2D32f_ptr(points) - - cdef CvSize cvpattern_size - cvpattern_size.height = pattern_size[1] - cvpattern_size.width = pattern_size[0] - - cdef IplImage srcimg - populate_iplimage(src, &srcimg) - - cdef int ncorners_found - c_cvFindChessboardCorners(&srcimg, cvpattern_size, cvpoints, &ncorners_found, flags) - - return points[:ncorners_found] - -def cvDrawChessboardCorners(np.ndarray out, pattern_size, np.ndarray corners): - """ - Wrapper around the OpenCV cvDrawChessboardCorners function. - - Parameters - ---------- - out : ndarray, dim 3, dtype: uint8 - Image to draw into - pattern_size : array_like, shape (2,) - Number of inner corners (w,h) - corners : ndarray, shape (n,2), dtype: float32 - Corners found in the image. See cvFindChessboardCorners and - cvFindCornerSubPix - """ - validate_array(out) - - assert_nchannels(out, [3]) - assert_dtype(out, [UINT8]) - - cdef CvSize cvpattern_size - cvpattern_size.height = pattern_size[1] - cvpattern_size.width = pattern_size[0] - - cdef IplImage img - populate_iplimage(out, &img) - - cdef CvPoint2D32f* cvcorners = array_as_cvPoint2D32f_ptr(corners) - - cdef int ncount = pattern_size[0]*pattern_size[1] - c_cvDrawChessboardCorners(&img, cvpattern_size, cvcorners, - ncount, len(corners) == ncount) def cvSobel(np.ndarray src, np.ndarray out=None, int xorder=1, int yorder=0, int aperture_size=3): @@ -542,11 +482,15 @@ def cvGoodFeaturesToTrack(np.ndarray src, int corner_count, cdef np.ndarray eig = new_array_like_diff_dtype(src, FLOAT32) cdef np.ndarray temp = new_array_like(eig) - cdef CvPoint2D32f* corners = ( - PyMem_Malloc(corner_count * sizeof(CvPoint2D32f))) - - cdef int out_corner_count - out_corner_count = corner_count + cdef np.npy_intp cornershape[2] + cornershape[0] = corner_count + cornershape[1] = 2 + + cdef np.ndarray out = new_array(2, cornershape, FLOAT32) + cdef CvPoint2D32f* cvcorners = array_as_cvPoint2D32f_ptr(out) + + cdef int ncorners_found + ncorners_found = corner_count cdef IplImage srcimg cdef IplImage eigimg @@ -563,32 +507,12 @@ def cvGoodFeaturesToTrack(np.ndarray src, int corner_count, assert_nchannels(mask, [1]) populate_iplimage(mask, maskimg) - c_cvGoodFeaturesToTrack(&srcimg, &eigimg, &tempimg, corners, - &out_corner_count, quality_level, min_distance, + c_cvGoodFeaturesToTrack(&srcimg, &eigimg, &tempimg, cvcorners, + &ncorners_found, quality_level, min_distance, maskimg, block_size, use_harris, k) - - # since the maximum allowed corners may not have been found - # the array might be too long, we create a new array and copy - # the the data into it - # - # It would be nice to use the numpy C-Api for this, but I couldn't quite - # get it to work - - cdef np.npy_intp cornershape[2] - cornershape[0] = out_corner_count - cornershape[1] = 2 - - cdef np.ndarray cornersarr = new_array(2, cornershape, FLOAT32) - cdef int i - for i in range(out_corner_count): - cornersarr[i,0] = corners[i].x - cornersarr[i,1] = corners[i].y - - PyMem_Free(corners) - - return cornersarr - + + return out[:ncorners_found] def cvResize(np.ndarray src, height=None, width=None, int method=CV_INTER_LINEAR): @@ -619,5 +543,100 @@ def cvResize(np.ndarray src, height=None, width=None, c_cvResize(&srcimg, &outimg, method) - return out + return out + +def cvFindChessboardCorners(np.ndarray src, pattern_size, + int flags = CV_CALIB_CB_ADAPTIVE_THRESH): + """ + Wrapper around the OpenCV cvFindChessboardCorners function. + src - Image to search for chessboard corners + pattern_size - Tuple of inner corners (h,w) + flags - see appropriate flags in opencv docs + http://opencv.willowgarage.com/documentation/cvreference.html + + returns - an nx2 array of the corners found. + + """ + + validate_array(src) + + assert_nchannels(src, [1, 3]) + assert_dtype(src, [UINT8]) + + cdef np.npy_intp outshape[2] + outshape[0] = pattern_size[0] * pattern_size[1] + outshape[1] = 2 + + out = new_array(2, outshape, FLOAT32) + cdef CvPoint2D32f* cvpoints = array_as_cvPoint2D32f_ptr(out) + + cdef CvSize cvpattern_size + cvpattern_size.height = pattern_size[0] + cvpattern_size.width = pattern_size[1] + + cdef IplImage srcimg + populate_iplimage(src, &srcimg) + + cdef int ncorners_found + c_cvFindChessboardCorners(&srcimg, cvpattern_size, cvpoints, + &ncorners_found, flags) + + return out[:ncorners_found] + +def cvDrawChessboardCorners(np.ndarray src, pattern_size, np.ndarray corners, + in_place=True): + """ + Wrapper around the OpenCV cvDrawChessboardCorners function. + + Parameters + ---------- + src : ndarray, dim 3, dtype: uint8 + Image to draw into. + pattern_size : array_like, shape (2,) + Number of inner corners (w,h) + corners : ndarray, shape (n,2), dtype: float32 + Corners found in the image. See cvFindChessboardCorners and + cvFindCornerSubPix + in_place: True/False (default=True) perform the drawing on the submitted + image. If false, a copy of the image will be made and drawn to. + """ + validate_array(src) + + assert_nchannels(src, [3]) + assert_dtype(src, [UINT8]) + + assert_ndims(corners, [2]) + assert_dtype(corners, [FLOAT32]) + + cdef np.ndarray out + + if not in_place: + out = src.copy() + else: + out = src + + cdef CvSize cvpattern_size + cvpattern_size.height = pattern_size[0] + cvpattern_size.width = pattern_size[1] + + cdef IplImage outimg + populate_iplimage(out, &outimg) + + cdef CvPoint2D32f* cvcorners = array_as_cvPoint2D32f_ptr(corners) + + cdef int ncount = pattern_size[0] * pattern_size[1] + + cdef int pattern_was_found + + if corners.shape[0] == ncount: + pattern_was_found = 1 + else: + pattern_was_found = 0 + + c_cvDrawChessboardCorners(&outimg, cvpattern_size, cvcorners, + ncount, pattern_was_found) + + return out + + diff --git a/scikits/image/opencv/tests/test_opencv_cv.py b/scikits/image/opencv/tests/test_opencv_cv.py index 098fe1a9..20738a73 100644 --- a/scikits/image/opencv/tests/test_opencv_cv.py +++ b/scikits/image/opencv/tests/test_opencv_cv.py @@ -17,6 +17,7 @@ opencv_skip = dec.skipif(cv is None, class OpenCVTest: lena_RGB_U8 = np.load(os.path.join(data_dir, 'lena_RGB_U8.npy')) lena_GRAY_U8 = np.load(os.path.join(data_dir, 'lena_GRAY_U8.npy')) + class TestSobel(OpenCVTest): @opencv_skip @@ -66,6 +67,7 @@ class TestSmooth(OpenCVTest): for st in (CV_BLUR_NO_SCALE, CV_BLUR, CV_GAUSSIAN, CV_MEDIAN, CV_BILATERAL): cvSmooth(self.lena_GRAY_U8, None, st, 3, 0, 0, 0, False) + class TestFindCornerSubPix: @opencv_skip @@ -79,12 +81,10 @@ class TestFindCornerSubPix: [1, 1, 1, 0, 0, 0, 1, 1, 1], [1, 1, 1, 0, 0, 0, 1, 1, 1], [1, 1, 1, 0, 0, 0, 1, 1, 1]], dtype='uint8') - corners = np.array([[2, 2], [2, 5], [5, 2], [5, 5]], dtype='float32') - cvFindCornerSubPix(img, corners, 4, (2, 2)) @@ -92,14 +92,34 @@ class TestGoodFeaturesToTrack(OpenCVTest): @opencv_skip def test_cvGoodFeaturesToTrack(self): cvGoodFeaturesToTrack(self.lena_GRAY_U8, 100, 0.1, 3) - + class TestResize(OpenCVTest): @opencv_skip def test_cvResize(self): cvResize(self.lena_RGB_U8, height=50, width=50, method=CV_INTER_LINEAR) cvResize(self.lena_RGB_U8, height=200, width=200, method=CV_INTER_CUBIC) + - +class TestFindChessboardCorners: + @opencv_skip + def test_cvFindChessboardCorners(self): + chessboard_GRAY_U8 = np.load(os.path.join(data_dir, + 'chessboard_GRAY_U8.npy')) + pts = cvFindChessboardCorners(chessboard_GRAY_U8, (7, 7)) + + +class TestDrawChessboardCorners: + @opencv_skip + def test_cvDrawChessboardCorners(self): + chessboard_GRAY_U8 = np.load(os.path.join(data_dir, + 'chessboard_GRAY_U8.npy')) + chessboard_RGB_U8 = np.load(os.path.join(data_dir, + 'chessboard_RGB_U8.npy')) + corners = cvFindChessboardCorners(chessboard_GRAY_U8, (7, 7)) + cvDrawChessboardCorners(chessboard_RGB_U8, (7, 7), corners) + + + if __name__ == '__main__': run_module_suite() diff --git a/setup.py b/setup.py index 90e05216..02d19849 100644 --- a/setup.py +++ b/setup.py @@ -33,6 +33,7 @@ def configuration(parent_package='', top_path=None): config.add_subpackage('scikits') config.add_subpackage(DISTNAME) config.add_data_files('scikits/__init__.py') + config.add_data_dir('scikits/image/data') return config