diff --git a/scikits/image/opencv/opencv_backend.c b/scikits/image/opencv/opencv_backend.c index 690b4eab..91003b69 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 Sat Oct 24 17:38:28 2009 */ +/* Generated by Cython 0.11.3 on Sat Oct 24 18:40:26 2009 */ #define PY_SSIZE_T_CLEAN #include "Python.h" diff --git a/scikits/image/opencv/opencv_cv.c b/scikits/image/opencv/opencv_cv.c index 7a5ce99d..73d36d77 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 Sat Oct 24 18:03:23 2009 */ +/* Generated by Cython 0.11.3 on Sat Oct 24 18:40:21 2009 */ #define PY_SSIZE_T_CLEAN #include "Python.h" @@ -953,6 +953,10 @@ typedef double (*__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvThresholdPtr)(__py typedef void (*__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvAdaptiveThresholdPtr)(__pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *, __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *, double, int, int, int, double); +typedef void (*__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvPyrDownPtr)(__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_cvPyrUpPtr)(__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_cvCalibrateCamera2Ptr)(struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvSize, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *, 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); @@ -1075,6 +1079,8 @@ static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvIntegralPtr __pyx_v_7scikits static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCvtColorPtr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCvtColor; static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvThresholdPtr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvThreshold; static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvAdaptiveThresholdPtr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvAdaptiveThreshold; +static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvPyrDownPtr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvPyrDown; +static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvPyrUpPtr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvPyrUp; static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2Ptr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCalibrateCamera2; 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; @@ -1438,6 +1444,10 @@ static char __pyx_k_cvThreshold[] = "cvThreshold"; static PyObject *__pyx_kp_cvThreshold; static char __pyx_k_cvAdaptiveThreshold[] = "cvAdaptiveThreshold"; static PyObject *__pyx_kp_cvAdaptiveThreshold; +static char __pyx_k_cvPyrDown[] = "cvPyrDown"; +static PyObject *__pyx_kp_cvPyrDown; +static char __pyx_k_cvPyrUp[] = "cvPyrUp"; +static PyObject *__pyx_kp_cvPyrUp; static char __pyx_k_117[] = "cvCalibrateCamera2"; static PyObject *__pyx_kp_117; static char __pyx_k_118[] = "cvFindChessboardCorners"; @@ -1602,7 +1612,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)"; -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":272 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":282 * # Function Implementations * #################################### * def cvSobel(np.ndarray src, np.ndarray out=None, int xorder=1, int yorder=0, # <<<<<<<<<<<<<< @@ -1673,22 +1683,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 = 272; __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 = 282; __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 = 272; __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 = 282; __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 = 272; __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 = 282; __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 = 273; __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 = 283; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_aperture_size = 3; } @@ -1698,9 +1708,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 = 273; __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 = 272; __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 = 272; __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 = 283; __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 = 282; __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 = 282; __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; @@ -1709,38 +1719,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 = 272; __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 = 282; __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 = 272; __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 = 272; __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 = 282; __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 = 282; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":281 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":291 * """ * * 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 = 281; __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 = 291; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":282 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":292 * * validate_array(src) * assert_dtype(src, [UINT8, INT8, FLOAT32]) # <<<<<<<<<<<<<< * assert_nchannels(src, [1]) * */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 282; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 292; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_145); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 282; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_145); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 292; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 282; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 292; __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 = 282; __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 = 292; __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); @@ -1751,25 +1761,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 = 282; __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 = 292; __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":283 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":293 * 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 = 283; __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 = 293; __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 = 283; __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 = 293; __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":285 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":295 * assert_nchannels(src, [1]) * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): # <<<<<<<<<<<<<< @@ -1788,29 +1798,29 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ } if (__pyx_t_4) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":286 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":296 * * 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 = 286; __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 = 296; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_kp_146); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_146); __Pyx_GIVEREF(__pyx_kp_146); - __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 = 286; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __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 = 296; __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 = 286; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 296; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L6; } __pyx_L6:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":288 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":298 * raise ValueError('aperture_size must be 3, 5, or 7') * * if out is not None: # <<<<<<<<<<<<<< @@ -1820,75 +1830,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) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":289 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":299 * * 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 = 289; __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 = 299; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":290 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":300 * 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 = 290; __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 = 300; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":291 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":301 * 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 = 291; __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 = 301; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":292 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":302 * 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 = 292; __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 = 302; __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 = 292; __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 = 302; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":293 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":303 * 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 = 293; __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 = 303; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 293; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 303; __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 = 293; __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 = 303; __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 = 293; __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 = 303; __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 = 293; __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 = 303; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_145); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 293; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_145); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 303; __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 = 293; __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 = 303; __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 = 293; __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 = 303; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_t_6 = __pyx_t_3; } else { @@ -1896,41 +1906,41 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ } if (__pyx_t_6) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":294 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":304 * 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_147); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 294; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_147); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 304; __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 = 294; __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 = 304; __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 = 294; __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 = 304; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; goto __pyx_L8; } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":296 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":306 * 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_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 296; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 306; __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 = 296; __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 = 306; __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 = 296; __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 = 306; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; } __pyx_L8:; @@ -1938,33 +1948,33 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":298 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":308 * 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 = 298; __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 = 308; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 298; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 308; __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 = 298; __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 = 308; __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 = 298; __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 = 308; __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 = 298; __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 = 308; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_145); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 298; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_145); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 308; __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 = 298; __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 = 308; __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 = 298; __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 = 308; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_t_3 = __pyx_t_4; } else { @@ -1972,16 +1982,16 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ } if (__pyx_t_3) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":299 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":309 * 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_147); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 299; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_147); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 309; __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 = 299; __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 = 309; __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)); @@ -1991,14 +2001,14 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":301 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":311 * 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 = 301; __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 = 311; __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); @@ -2008,7 +2018,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ } __pyx_L7:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":306 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":316 * cdef IplImage outimg * * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -2017,7 +2027,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)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":307 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":317 * * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -2026,7 +2036,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)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":309 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":319 * populate_iplimage(out, &outimg) * * c_cvSobel(&srcimg, &outimg, xorder, yorder, aperture_size) # <<<<<<<<<<<<<< @@ -2035,7 +2045,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); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":311 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":321 * c_cvSobel(&srcimg, &outimg, xorder, yorder, aperture_size) * * return out # <<<<<<<<<<<<<< @@ -2064,7 +2074,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":313 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":323 * return out * * def cvLaplace(np.ndarray src, np.ndarray out=None, int aperture_size=3): # <<<<<<<<<<<<<< @@ -2121,12 +2131,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 = 313; __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 = 323; __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 = 313; __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 = 323; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_aperture_size = 3; } @@ -2134,7 +2144,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 = 313; __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 = 323; __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; @@ -2143,38 +2153,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 = 313; __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 = 323; __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 = 313; __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 = 313; __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 = 323; __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 = 323; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":321 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":331 * """ * * 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 = 321; __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 = 331; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":322 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":332 * * validate_array(src) * assert_dtype(src, [UINT8, INT8, FLOAT32]) # <<<<<<<<<<<<<< * assert_nchannels(src, [1]) * */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 322; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 332; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_145); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 322; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_145); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 332; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 322; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 332; __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 = 322; __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 = 332; __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); @@ -2185,25 +2195,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 = 322; __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 = 332; __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":323 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":333 * 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 = 323; __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 = 333; __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 = 323; __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 = 333; __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":325 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":335 * assert_nchannels(src, [1]) * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): # <<<<<<<<<<<<<< @@ -2222,29 +2232,29 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject } if (__pyx_t_4) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":326 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":336 * * 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 = 326; __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 = 336; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_kp_148); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_148); __Pyx_GIVEREF(__pyx_kp_148); - __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 = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __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 = 336; __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 = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 336; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L6; } __pyx_L6:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":329 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":339 * * * if out is not None: # <<<<<<<<<<<<<< @@ -2254,75 +2264,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) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":330 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":340 * * 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 = 330; __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 = 340; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":331 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":341 * 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 = 331; __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 = 341; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":332 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":342 * 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 = 332; __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 = 342; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":333 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":343 * 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 = 333; __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 = 343; __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 = 333; __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 = 343; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":334 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":344 * 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 = 334; __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 = 344; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 334; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 344; __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 = 334; __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 = 344; __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 = 334; __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 = 344; __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 = 334; __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 = 344; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_145); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 334; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_145); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 344; __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 = 334; __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 = 344; __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 = 334; __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 = 344; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_t_6 = __pyx_t_3; } else { @@ -2330,41 +2340,41 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject } if (__pyx_t_6) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":335 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":345 * 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_147); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_147); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 345; __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 = 335; __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 = 345; __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 = 335; __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 = 345; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; goto __pyx_L8; } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":337 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":347 * 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_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 337; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 347; __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 = 337; __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 = 347; __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 = 337; __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 = 347; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; } __pyx_L8:; @@ -2372,33 +2382,33 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":339 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":349 * 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 = 339; __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 = 349; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 339; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 349; __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 = 339; __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 = 349; __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 = 339; __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 = 349; __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 = 339; __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 = 349; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_145); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 339; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_145); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 349; __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 = 339; __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 = 349; __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 = 339; __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 = 349; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_t_3 = __pyx_t_4; } else { @@ -2406,16 +2416,16 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject } if (__pyx_t_3) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":340 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":350 * 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_147); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 340; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_147); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 350; __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 = 340; __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 = 350; __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)); @@ -2425,14 +2435,14 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":342 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":352 * 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 = 342; __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 = 352; __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); @@ -2442,7 +2452,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject } __pyx_L7:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":347 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":357 * cdef IplImage outimg * * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -2451,7 +2461,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)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":348 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":358 * * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -2460,7 +2470,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)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":350 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":360 * populate_iplimage(out, &outimg) * * c_cvLaplace(&srcimg, &outimg, aperture_size) # <<<<<<<<<<<<<< @@ -2469,7 +2479,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); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":352 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":362 * c_cvLaplace(&srcimg, &outimg, aperture_size) * * return out # <<<<<<<<<<<<<< @@ -2498,7 +2508,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":354 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":364 * return out * * def cvCanny(np.ndarray src, np.ndarray out=None, double threshold1=10, # <<<<<<<<<<<<<< @@ -2565,22 +2575,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 = 354; __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 = 364; __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 = 354; __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 = 364; __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 = 355; __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 = 365; __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 = 355; __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 = 365; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_aperture_size = 3; } @@ -2590,9 +2600,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 = 355; __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 = 355; __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 = 354; __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 = 365; __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 = 365; __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 = 364; __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; @@ -2601,40 +2611,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 = 354; __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 = 364; __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 = 354; __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 = 354; __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 = 364; __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 = 364; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":363 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":373 * """ * * 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 = 363; __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 = 373; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":364 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":374 * * 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 = 364; __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 = 374; __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 = 364; __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 = 374; __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":366 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":376 * assert_nchannels(src, [1]) * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): # <<<<<<<<<<<<<< @@ -2653,29 +2663,29 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_ } if (__pyx_t_4) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":367 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":377 * * 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 = 367; __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 = 377; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_kp_149); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_149); __Pyx_GIVEREF(__pyx_kp_149); - __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 = 367; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __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 = 377; __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 = 367; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 377; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L6; } __pyx_L6:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":370 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":380 * * * if out is not None: # <<<<<<<<<<<<<< @@ -2685,59 +2695,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) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":371 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":381 * * 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 = 371; __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 = 381; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":372 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":382 * 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 = 372; __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 = 382; __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 = 372; __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 = 382; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":373 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":383 * 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 = 373; __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 = 383; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":374 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":384 * 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 = 374; __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 = 384; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L7; } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":376 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":386 * 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 = 376; __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 = 386; __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); @@ -2745,7 +2755,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_ } __pyx_L7:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":380 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":390 * cdef IplImage srcimg * cdef IplImage outimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -2754,7 +2764,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)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":381 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":391 * cdef IplImage outimg * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -2763,7 +2773,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)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":383 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":393 * populate_iplimage(out, &outimg) * * c_cvCanny(&srcimg, &outimg, threshold1, threshold2, aperture_size) # <<<<<<<<<<<<<< @@ -2772,7 +2782,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); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":385 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":395 * c_cvCanny(&srcimg, &outimg, threshold1, threshold2, aperture_size) * * return out # <<<<<<<<<<<<<< @@ -2798,7 +2808,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_ return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":387 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":397 * return out * * def cvPreCornerDetect(np.ndarray src, np.ndarray out=None, # <<<<<<<<<<<<<< @@ -2853,12 +2863,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 = 387; __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 = 397; __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 = 388; __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 = 398; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_aperture_size = 3; } @@ -2866,7 +2876,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 = 388; __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 = 398; __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; @@ -2875,36 +2885,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 = 387; __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 = 397; __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 = 387; __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 = 387; __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 = 397; __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 = 397; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":395 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":405 * """ * * 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 = 395; __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 = 405; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":396 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":406 * * validate_array(src) * assert_dtype(src, [UINT8, FLOAT32]) # <<<<<<<<<<<<<< * assert_nchannels(src, [1]) * */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 396; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 406; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 396; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 406; __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 = 396; __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 = 406; __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); @@ -2912,25 +2922,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 = 396; __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 = 406; __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":397 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":407 * 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 = 397; __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 = 407; __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 = 397; __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 = 407; __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":399 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":409 * assert_nchannels(src, [1]) * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): # <<<<<<<<<<<<<< @@ -2949,29 +2959,29 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P } if (__pyx_t_4) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":400 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":410 * * 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 = 400; __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 = 410; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_kp_150); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_150); __Pyx_GIVEREF(__pyx_kp_150); - __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 = 400; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __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 = 410; __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 = 400; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 410; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L6; } __pyx_L6:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":402 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":412 * raise ValueError('aperture_size must be 3, 5, or 7') * * if out is not None: # <<<<<<<<<<<<<< @@ -2981,63 +2991,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) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":403 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":413 * * 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 = 403; __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 = 413; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":404 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":414 * 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 = 404; __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 = 414; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":405 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":415 * 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_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 405; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 415; __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 = 405; __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 = 415; __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 = 405; __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 = 415; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":406 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":416 * 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 = 406; __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 = 416; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L7; } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":408 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":418 * 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_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 408; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 418; __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 = 408; __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 = 418; __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)); @@ -3046,7 +3056,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P } __pyx_L7:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":412 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":422 * cdef IplImage srcimg * cdef IplImage outimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -3055,7 +3065,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)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":413 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":423 * cdef IplImage outimg * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -3064,7 +3074,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)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":415 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":425 * populate_iplimage(out, &outimg) * * c_cvPreCornerDetect(&srcimg, &outimg, aperture_size) # <<<<<<<<<<<<<< @@ -3073,7 +3083,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); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":417 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":427 * c_cvPreCornerDetect(&srcimg, &outimg, aperture_size) * * return out # <<<<<<<<<<<<<< @@ -3101,7 +3111,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":419 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":429 * return out * * def cvCornerEigenValsAndVecs(np.ndarray src, int block_size=3, # <<<<<<<<<<<<<< @@ -3158,16 +3168,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 = 419; __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 = 429; __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 = 419; __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 = 429; __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 = 420; __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 = 430; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_aperture_size = 3; } @@ -3175,8 +3185,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 = 420; __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 = 419; __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 = 430; __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 = 429; __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; @@ -3184,50 +3194,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 = 419; __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 = 429; __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 = 419; __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 = 429; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":432 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":442 * # 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 = 432; __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 = 442; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":433 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":443 * * 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 = 433; __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 = 443; __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 = 433; __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 = 443; __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":434 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":444 * 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_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 434; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 444; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 434; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 444; __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 = 434; __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 = 444; __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); @@ -3235,10 +3245,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 = 434; __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 = 444; __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":436 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":446 * assert_dtype(src, [UINT8, FLOAT32]) * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): # <<<<<<<<<<<<<< @@ -3257,29 +3267,29 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn } if (__pyx_t_4) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":437 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":447 * * 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 = 437; __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 = 447; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_kp_151); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_151); __Pyx_GIVEREF(__pyx_kp_151); - __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 = 437; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __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 = 447; __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 = 437; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 447; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L6; } __pyx_L6:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":440 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":450 * * cdef np.npy_intp outshape[2] * outshape[0] = src.shape[0] # <<<<<<<<<<<<<< @@ -3288,7 +3298,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn */ (__pyx_v_outshape[0]) = (__pyx_v_src->dimensions[0]); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":441 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":451 * cdef np.npy_intp outshape[2] * outshape[0] = src.shape[0] * outshape[1] = src.shape[1] * 6 # <<<<<<<<<<<<<< @@ -3297,23 +3307,23 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn */ (__pyx_v_outshape[1]) = ((__pyx_v_src->dimensions[1]) * ((npy_intp)6)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":443 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":453 * outshape[1] = src.shape[1] * 6 * * out = new_array(2, outshape, FLOAT32) # <<<<<<<<<<<<<< * * cdef IplImage srcimg */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 443; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 453; __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 = 443; __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 = 453; __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; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":447 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":457 * cdef IplImage srcimg * cdef IplImage outimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -3322,17 +3332,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)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":448 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":458 * 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 = 448; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 458; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(((PyArrayObject *)__pyx_v_out), (&__pyx_v_outimg)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":450 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":460 * populate_iplimage(out, &outimg) * * c_cvCornerEigenValsAndVecs(&srcimg, &outimg, block_size, aperture_size) # <<<<<<<<<<<<<< @@ -3341,7 +3351,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); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":452 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":462 * c_cvCornerEigenValsAndVecs(&srcimg, &outimg, block_size, aperture_size) * * return out.reshape(out.shape[0], -1, 6) # <<<<<<<<<<<<<< @@ -3349,14 +3359,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 = 452; __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 = 462; __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 = 452; __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 = 462; __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 = 452; __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 = 462; __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 = 452; __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 = 462; __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); @@ -3367,7 +3377,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 = 452; __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 = 462; __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; @@ -3392,7 +3402,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":454 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":464 * return out.reshape(out.shape[0], -1, 6) * * def cvCornerMinEigenVal(np.ndarray src, int block_size=3, # <<<<<<<<<<<<<< @@ -3447,16 +3457,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 = 454; __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 = 464; __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 = 454; __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 = 464; __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 = 455; __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 = 465; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_aperture_size = 3; } @@ -3464,8 +3474,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 = 455; __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 = 454; __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 = 465; __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 = 464; __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; @@ -3473,50 +3483,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 = 454; __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 = 464; __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 = 454; __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 = 464; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":465 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":475 * # 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 = 465; __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 = 475; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":466 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":476 * * 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 = 466; __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 = 476; __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 = 466; __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 = 476; __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":467 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":477 * 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_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 467; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 477; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 467; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 477; __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 = 467; __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 = 477; __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); @@ -3524,10 +3534,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 = 467; __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 = 477; __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":469 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":479 * assert_dtype(src, [UINT8, FLOAT32]) * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): # <<<<<<<<<<<<<< @@ -3546,45 +3556,45 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenVal } if (__pyx_t_4) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":470 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":480 * * 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 = 470; __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 = 480; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_kp_152); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_152); __Pyx_GIVEREF(__pyx_kp_152); - __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 = 470; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __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 = 480; __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 = 470; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 480; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L6; } __pyx_L6:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":472 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":482 * 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_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 472; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); 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_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 = 472; __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 = 482; __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; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":476 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":486 * cdef IplImage srcimg * cdef IplImage outimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -3593,17 +3603,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)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":477 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":487 * 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 = 477; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 487; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(((PyArrayObject *)__pyx_v_out), (&__pyx_v_outimg)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":479 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":489 * populate_iplimage(out, &outimg) * * c_cvCornerMinEigenVal(&srcimg, &outimg, block_size, aperture_size) # <<<<<<<<<<<<<< @@ -3612,7 +3622,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); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":481 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":491 * c_cvCornerMinEigenVal(&srcimg, &outimg, block_size, aperture_size) * * return out # <<<<<<<<<<<<<< @@ -3640,7 +3650,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenVal return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":483 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":493 * return out * * def cvCornerHarris(np.ndarray src, int block_size=3, int aperture_size=3, # <<<<<<<<<<<<<< @@ -3702,21 +3712,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 = 483; __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 = 493; __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 = 483; __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 = 493; __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 = 483; __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 = 493; __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 = 484; __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 = 494; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_k = 0.040000000000000001; } @@ -3725,9 +3735,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 = 484; __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 = 483; __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 = 483; __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 = 494; __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 = 493; __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 = 493; __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; @@ -3735,50 +3745,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 = 483; __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 = 493; __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 = 483; __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 = 493; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":494 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":504 * # 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 = 494; __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 = 504; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":495 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":505 * * 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 = 495; __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 = 505; __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 = 495; __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 = 505; __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":496 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":506 * 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_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 496; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 506; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 496; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 506; __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 = 496; __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 = 506; __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); @@ -3786,10 +3796,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 = 496; __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 = 506; __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":498 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":508 * assert_dtype(src, [UINT8, FLOAT32]) * * if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7): # <<<<<<<<<<<<<< @@ -3808,45 +3818,45 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerHarris(PyOb } if (__pyx_t_4) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":499 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":509 * * 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 = 499; __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 = 509; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_kp_153); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_153); __Pyx_GIVEREF(__pyx_kp_153); - __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 = 499; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __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 = 509; __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 = 499; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 509; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L6; } __pyx_L6:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":501 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":511 * 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_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 501; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 511; __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 = 501; __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 = 511; __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; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":505 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":515 * cdef IplImage srcimg * cdef IplImage outimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -3855,17 +3865,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)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":506 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":516 * 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 = 506; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 516; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(((PyArrayObject *)__pyx_v_out), (&__pyx_v_outimg)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":508 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":518 * populate_iplimage(out, &outimg) * * c_cvCornerHarris(&srcimg, &outimg, block_size, aperture_size, k) # <<<<<<<<<<<<<< @@ -3874,7 +3884,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); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":510 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":520 * c_cvCornerHarris(&srcimg, &outimg, block_size, aperture_size, k) * * return out # <<<<<<<<<<<<<< @@ -3902,7 +3912,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerHarris(PyOb return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":512 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":522 * return out * * def cvFindCornerSubPix(np.ndarray src, np.ndarray corners, int count, win, # <<<<<<<<<<<<<< @@ -3959,19 +3969,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 = 512; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvFindCornerSubPix", 0, 4, 7, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 522; __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 = 512; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvFindCornerSubPix", 0, 4, 7, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 522; __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 = 512; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvFindCornerSubPix", 0, 4, 7, 3); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 522; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 4: if (kw_args > 0) { @@ -3990,20 +4000,20 @@ 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 = 512; __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 = 522; __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 = 512; __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 = 522; __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 = 513; __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 = 523; __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 = 514; __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 = 524; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_epsilon = 1.0000000000000001e-05; } @@ -4013,14 +4023,14 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix( __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 = 514; __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 = 524; __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 = 513; __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 = 523; __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 = 512; __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 = 522; __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; @@ -4029,97 +4039,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 = 512; __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 = 522; __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 = 512; __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 = 512; __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 = 522; __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 = 522; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":522 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":532 * """ * * 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 = 522; __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 = 532; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":523 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":533 * * 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 = 523; __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 = 533; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":525 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":535 * 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 = 525; __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 = 535; __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 = 525; __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 = 535; __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":526 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":536 * * assert_nchannels(src, [1]) * assert_dtype(src, [UINT8]) # <<<<<<<<<<<<<< * * assert_nchannels(corners, [1]) */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 526; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 536; __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 = 526; __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 = 536; __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 = 526; __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 = 536; __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":528 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":538 * 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 = 528; __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 = 538; __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 = 528; __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 = 538; __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":529 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":539 * * assert_nchannels(corners, [1]) * assert_dtype(corners, [FLOAT32]) # <<<<<<<<<<<<<< * * # make sure the number of points */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 539; __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 = 529; __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 = 539; __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 = 529; __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 = 539; __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":537 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":547 * # flat anyway, but regardless, the validate_array function ensures * # that it is 2D * cdef int nbytes = get_array_nbytes(corners) # <<<<<<<<<<<<<< @@ -4128,7 +4138,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)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":538 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":548 * # that it is 2D * cdef int nbytes = get_array_nbytes(corners) * if nbytes != (count * 2 * 4): # <<<<<<<<<<<<<< @@ -4138,29 +4148,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) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":539 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":549 * 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 = 539; __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 = 549; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_kp_154); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_154); __Pyx_GIVEREF(__pyx_kp_154); - __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 = 539; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __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 = 549; __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 = 539; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 549; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L6; } __pyx_L6:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":541 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":551 * raise ValueError('The number of declared points is different ' * 'than exists in the array.') * cdef CvPoint2D32f* cvcorners = array_as_cvPoint2D32f_ptr(corners) # <<<<<<<<<<<<<< @@ -4169,59 +4179,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); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":544 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":554 * * 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 = 544; __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 = 554; __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 = 544; __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 = 554; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_v_cvwin.height = ((int)__pyx_t_1); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":545 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":555 * 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 = 545; __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 = 555; __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 = 545; __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 = 555; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_v_cvwin.width = ((int)__pyx_t_1); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":548 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":558 * * 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 = 548; __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 = 558; __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 = 548; __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 = 558; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_v_cvzerozone.height = ((int)__pyx_t_1); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":549 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":559 * 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 = 549; __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 = 559; __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 = 549; __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 = 559; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_v_cvzerozone.width = ((int)__pyx_t_1); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":552 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":562 * * cdef IplImage srcimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -4230,7 +4240,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)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":555 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":565 * * cdef CvTermCriteria crit * crit = get_cvTermCriteria(iterations, epsilon) # <<<<<<<<<<<<<< @@ -4239,7 +4249,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); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":557 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":567 * crit = get_cvTermCriteria(iterations, epsilon) * * c_cvFindCornerSubPix(&srcimg, cvcorners, count, cvwin, cvzerozone, crit) # <<<<<<<<<<<<<< @@ -4248,7 +4258,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); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":559 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":569 * c_cvFindCornerSubPix(&srcimg, cvcorners, count, cvwin, cvzerozone, crit) * * return None # <<<<<<<<<<<<<< @@ -4274,7 +4284,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix( return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":561 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":571 * return None * * def cvGoodFeaturesToTrack(np.ndarray src, int corner_count, # <<<<<<<<<<<<<< @@ -4337,19 +4347,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 = 561; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvGoodFeaturesToTrack", 0, 4, 8, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 571; __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 = 561; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvGoodFeaturesToTrack", 0, 4, 8, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 571; __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 = 561; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvGoodFeaturesToTrack", 0, 4, 8, 3); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 571; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 4: if (kw_args > 0) { @@ -4373,25 +4383,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 = 561; __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 = 571; __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 = 561; __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 = 562; __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 = 562; __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 = 571; __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 = 572; __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 = 572; __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 = 563; __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 = 573; __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 = 564; __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 = 574; __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 = 564; __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 = 574; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_k = 0.040000000000000001; } @@ -4402,17 +4412,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 = 564; __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 = 574; __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 = 564; __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 = 574; __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 = 563; __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 = 573; __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 = 562; __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 = 562; __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 = 561; __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 = 572; __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 = 572; __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 = 571; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); break; default: goto __pyx_L5_argtuple_error; @@ -4420,35 +4430,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 = 561; __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 = 571; __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 = 561; __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 = 563; __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 = 571; __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 = 573; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":571 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":581 * """ * * 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 = 571; __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 = 581; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":572 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":582 * * validate_array(src) * assert_dtype(src, [UINT8, FLOAT32]) # <<<<<<<<<<<<<< * assert_nchannels(src, [1]) * */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 572; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 582; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 572; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); 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 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 572; __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 = 582; __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); @@ -4456,52 +4466,52 @@ 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 = 572; __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 = 582; __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":573 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":583 * 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 = 573; __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 = 583; __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 = 573; __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 = 583; __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":575 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":585 * 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_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 575; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 585; __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 = 575; __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 = 585; __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; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":576 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":586 * * cdef np.ndarray eig = new_array_like_diff_dtype(src, FLOAT32) * cdef np.ndarray temp = new_array_like(eig) # <<<<<<<<<<<<<< * * 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 = 576; __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 = 586; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_v_temp = ((PyArrayObject *)__pyx_t_2); __pyx_t_2 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":579 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":589 * * cdef np.npy_intp cornershape[2] * cornershape[0] = corner_count # <<<<<<<<<<<<<< @@ -4510,7 +4520,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra */ (__pyx_v_cornershape[0]) = ((npy_intp)__pyx_v_corner_count); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":580 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":590 * cdef np.npy_intp cornershape[2] * cornershape[0] = corner_count * cornershape[1] = 2 # <<<<<<<<<<<<<< @@ -4519,22 +4529,22 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra */ (__pyx_v_cornershape[1]) = 2; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":582 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":592 * 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_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 582; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 592; __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_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 = 592; __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":583 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":593 * * cdef np.ndarray out = new_array(2, cornershape, FLOAT32) * cdef CvPoint2D32f* cvcorners = array_as_cvPoint2D32f_ptr(out) # <<<<<<<<<<<<<< @@ -4543,7 +4553,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra */ __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":586 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":596 * * cdef int ncorners_found * ncorners_found = corner_count # <<<<<<<<<<<<<< @@ -4552,7 +4562,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra */ __pyx_v_ncorners_found = __pyx_v_corner_count; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":593 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":603 * cdef IplImage *maskimg * * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -4561,7 +4571,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)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":594 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":604 * * populate_iplimage(src, &srcimg) * populate_iplimage(eig, &eigimg) # <<<<<<<<<<<<<< @@ -4570,7 +4580,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)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":595 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":605 * populate_iplimage(src, &srcimg) * populate_iplimage(eig, &eigimg) * populate_iplimage(temp, &tempimg) # <<<<<<<<<<<<<< @@ -4579,7 +4589,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)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":596 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":606 * populate_iplimage(eig, &eigimg) * populate_iplimage(temp, &tempimg) * if mask is None: # <<<<<<<<<<<<<< @@ -4589,7 +4599,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra __pyx_t_3 = (((PyObject *)__pyx_v_mask) == Py_None); if (__pyx_t_3) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":597 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":607 * populate_iplimage(temp, &tempimg) * if mask is None: * maskimg = NULL # <<<<<<<<<<<<<< @@ -4601,31 +4611,31 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":599 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":609 * 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 = 599; __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 = 609; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":600 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":610 * 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 = 600; __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 = 610; __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 = 600; __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 = 610; __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":601 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":611 * validate_array(mask) * assert_nchannels(mask, [1]) * populate_iplimage(mask, maskimg) # <<<<<<<<<<<<<< @@ -4636,7 +4646,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra } __pyx_L6:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":606 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":616 * &ncorners_found, quality_level, min_distance, * maskimg, block_size, * use_harris, k) # <<<<<<<<<<<<<< @@ -4645,7 +4655,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra */ __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); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":608 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":618 * use_harris, k) * * return out[:ncorners_found] # <<<<<<<<<<<<<< @@ -4653,7 +4663,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra * def cvGetRectSubPix(np.ndarray src, size, center): */ __Pyx_XDECREF(__pyx_r); - __pyx_1 = PySequence_GetSlice(((PyObject *)__pyx_v_out), 0, __pyx_v_ncorners_found); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 608; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = PySequence_GetSlice(((PyObject *)__pyx_v_out), 0, __pyx_v_ncorners_found); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 618; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); __pyx_r = __pyx_1; __pyx_1 = 0; @@ -4676,7 +4686,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":610 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":620 * return out[:ncorners_found] * * def cvGetRectSubPix(np.ndarray src, size, center): # <<<<<<<<<<<<<< @@ -4724,17 +4734,17 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetRectSubPix(PyO values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_size); if (likely(values[1])) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("cvGetRectSubPix", 1, 3, 3, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 610; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvGetRectSubPix", 1, 3, 3, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 620; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 2: values[2] = PyDict_GetItem(__pyx_kwds, __pyx_kp_center); if (likely(values[2])) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("cvGetRectSubPix", 1, 3, 3, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 610; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvGetRectSubPix", 1, 3, 3, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 620; __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), "cvGetRectSubPix") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 610; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvGetRectSubPix") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 620; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); __pyx_v_size = values[1]; @@ -4748,23 +4758,23 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetRectSubPix(PyO } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvGetRectSubPix", 1, 3, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 610; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvGetRectSubPix", 1, 3, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 620; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvGetRectSubPix"); 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 = 610; __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 = 620; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":627 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":637 * ''' * * validate_array(src) # <<<<<<<<<<<<<< * * cdef np.npy_intp* shape = clone_array_shape(src) */ - __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 = 627; __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 = 637; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":629 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":639 * validate_array(src) * * cdef np.npy_intp* shape = clone_array_shape(src) # <<<<<<<<<<<<<< @@ -4773,74 +4783,74 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetRectSubPix(PyO */ __pyx_v_shape = __pyx_f_7scikits_5image_6opencv_14opencv_backend_clone_array_shape(__pyx_v_src); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":630 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":640 * * cdef np.npy_intp* shape = clone_array_shape(src) * shape[0] = size[0] # <<<<<<<<<<<<<< * shape[1] = size[1] * */ - __pyx_1 = __Pyx_GetItemInt(__pyx_v_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 630; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 640; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_2 = __Pyx_PyInt_from_py_npy_intp(__pyx_1); if (unlikely((__pyx_t_2 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 630; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_from_py_npy_intp(__pyx_1); if (unlikely((__pyx_t_2 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 640; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; (__pyx_v_shape[0]) = ((npy_intp)__pyx_t_2); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":631 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":641 * cdef np.npy_intp* shape = clone_array_shape(src) * shape[0] = size[0] * shape[1] = size[1] # <<<<<<<<<<<<<< * * cdef CvPoint2D32f cvcenter */ - __pyx_1 = __Pyx_GetItemInt(__pyx_v_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 631; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 641; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_2 = __Pyx_PyInt_from_py_npy_intp(__pyx_1); if (unlikely((__pyx_t_2 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 631; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_from_py_npy_intp(__pyx_1); if (unlikely((__pyx_t_2 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 641; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; (__pyx_v_shape[1]) = ((npy_intp)__pyx_t_2); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":634 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":644 * * cdef CvPoint2D32f cvcenter * cvcenter.x = center[0] # <<<<<<<<<<<<<< * cvcenter.y = center[1] * */ - __pyx_1 = __Pyx_GetItemInt(__pyx_v_center, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 634; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_center, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 644; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_3 = __pyx_PyFloat_AsDouble(__pyx_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 634; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __pyx_PyFloat_AsDouble(__pyx_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 644; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_v_cvcenter.x = ((float)__pyx_t_3); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":635 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":645 * cdef CvPoint2D32f cvcenter * cvcenter.x = center[0] * cvcenter.y = center[1] # <<<<<<<<<<<<<< * * cdef np.ndarray out = new_array(src.ndim, shape, src.dtype) */ - __pyx_1 = __Pyx_GetItemInt(__pyx_v_center, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_center, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 645; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_3 = __pyx_PyFloat_AsDouble(__pyx_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __pyx_PyFloat_AsDouble(__pyx_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 645; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_v_cvcenter.y = ((float)__pyx_t_3); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":637 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":647 * cvcenter.y = center[1] * * cdef np.ndarray out = new_array(src.ndim, shape, src.dtype) # <<<<<<<<<<<<<< * * cdef IplImage srcimg */ - __pyx_t_4 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 637; __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 = 647; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); - __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(__pyx_v_src->nd, __pyx_v_shape, __pyx_t_4)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 637; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(__pyx_v_src->nd, __pyx_v_shape, __pyx_t_4)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 647; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __pyx_v_out = ((PyArrayObject *)__pyx_t_5); __pyx_t_5 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":641 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":651 * cdef IplImage srcimg * cdef IplImage outimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -4849,7 +4859,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetRectSubPix(PyO */ __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":642 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":652 * cdef IplImage outimg * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -4858,7 +4868,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetRectSubPix(PyO */ __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":644 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":654 * populate_iplimage(out, &outimg) * * c_cvGetRectSubPix(&srcimg, &outimg, cvcenter) # <<<<<<<<<<<<<< @@ -4867,7 +4877,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetRectSubPix(PyO */ __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvGetRectSubPix((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_cvcenter); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":646 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":656 * c_cvGetRectSubPix(&srcimg, &outimg, cvcenter) * * PyMem_Free(shape) # <<<<<<<<<<<<<< @@ -4876,7 +4886,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetRectSubPix(PyO */ PyMem_Free(__pyx_v_shape); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":648 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":658 * PyMem_Free(shape) * * return out # <<<<<<<<<<<<<< @@ -4903,7 +4913,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetRectSubPix(PyO return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":650 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":660 * return out * * def cvGetQuadrangleSubPix(np.ndarray src, np.ndarray warpmat, float_out=False): # <<<<<<<<<<<<<< @@ -4950,7 +4960,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubP values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_warpmat); if (likely(values[1])) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("cvGetQuadrangleSubPix", 0, 2, 3, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 650; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvGetQuadrangleSubPix", 0, 2, 3, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 660; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 2: if (kw_args > 0) { @@ -4959,7 +4969,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubP } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvGetQuadrangleSubPix") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 650; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvGetQuadrangleSubPix") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 660; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); __pyx_v_warpmat = ((PyArrayObject *)values[1]); @@ -4978,41 +4988,41 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubP } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvGetQuadrangleSubPix", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 650; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvGetQuadrangleSubPix", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 660; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvGetQuadrangleSubPix"); 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 = 650; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_warpmat), __pyx_ptype_5numpy_ndarray, 1, "warpmat", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 650; __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 = 660; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_warpmat), __pyx_ptype_5numpy_ndarray, 1, "warpmat", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 660; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":664 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":674 * float_out == True (see above) * ''' * validate_array(src) # <<<<<<<<<<<<<< * validate_array(warpmat) * */ - __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 = 664; __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 = 674; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":665 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":675 * ''' * validate_array(src) * validate_array(warpmat) # <<<<<<<<<<<<<< * * assert_nchannels(src, [1, 3]) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_warpmat); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 665; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_warpmat); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 675; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":667 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":677 * validate_array(warpmat) * * assert_nchannels(src, [1, 3]) # <<<<<<<<<<<<<< * * assert_nchannels(warpmat, [1]) */ - __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 667; __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 = 677; __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); @@ -5020,25 +5030,25 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubP __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 = 667; __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 = 677; __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":669 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":679 * assert_nchannels(src, [1, 3]) * * assert_nchannels(warpmat, [1]) # <<<<<<<<<<<<<< * * assert warpmat.shape[0] == 2, 'warpmat must be 2x3' */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 669; __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 = 679; __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_warpmat, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 669; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_warpmat, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 679; __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":671 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":681 * assert_nchannels(warpmat, [1]) * * assert warpmat.shape[0] == 2, 'warpmat must be 2x3' # <<<<<<<<<<<<<< @@ -5048,11 +5058,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubP #ifndef PYREX_WITHOUT_ASSERTIONS if (unlikely(!((__pyx_v_warpmat->dimensions[0]) == 2))) { PyErr_SetObject(PyExc_AssertionError, __pyx_kp_155); - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 671; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 681; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } #endif - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":672 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":682 * * assert warpmat.shape[0] == 2, 'warpmat must be 2x3' * assert warpmat.shape[1] == 3, 'warpmat must be 2x3' # <<<<<<<<<<<<<< @@ -5062,47 +5072,47 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubP #ifndef PYREX_WITHOUT_ASSERTIONS if (unlikely(!((__pyx_v_warpmat->dimensions[1]) == 3))) { PyErr_SetObject(PyExc_AssertionError, __pyx_kp_156); - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 672; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 682; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } #endif - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":676 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":686 * cdef np.ndarray out * * if float_out: # <<<<<<<<<<<<<< * assert_dtype(src, [UINT8]) * out = new_array_like_diff_dtype(src, FLOAT32) */ - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_float_out); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 676; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_float_out); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 686; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (__pyx_t_3) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":677 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":687 * * if float_out: * assert_dtype(src, [UINT8]) # <<<<<<<<<<<<<< * out = new_array_like_diff_dtype(src, FLOAT32) * else: */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 677; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 687; __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 = 677; __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 = 687; __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 = 677; __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 = 687; __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":678 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":688 * if float_out: * assert_dtype(src, [UINT8]) * out = new_array_like_diff_dtype(src, FLOAT32) # <<<<<<<<<<<<<< * else: * out = new_array_like(src) */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 678; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 688; __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 = 678; __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 = 688; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __Pyx_DECREF(((PyObject *)__pyx_v_out)); @@ -5112,14 +5122,14 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubP } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":680 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":690 * out = new_array_like_diff_dtype(src, FLOAT32) * else: * out = new_array_like(src) # <<<<<<<<<<<<<< * * cdef IplImage srcimg */ - __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 680; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 690; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(((PyObject *)__pyx_v_out)); __pyx_v_out = ((PyArrayObject *)__pyx_t_2); @@ -5127,7 +5137,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubP } __pyx_L6:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":687 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":697 * cdef CvMat* cvmatptr * * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -5136,7 +5146,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubP */ __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":688 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":698 * * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -5145,7 +5155,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubP */ __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":689 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":699 * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) * populate_iplimage(warpmat, &cvmat) # <<<<<<<<<<<<<< @@ -5154,7 +5164,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubP */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_warpmat, (&__pyx_v_cvmat)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":690 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":700 * populate_iplimage(out, &outimg) * populate_iplimage(warpmat, &cvmat) * cvmatptr = cvmat_ptr_from_iplimage(&cvmat) # <<<<<<<<<<<<<< @@ -5163,7 +5173,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubP */ __pyx_v_cvmatptr = __pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage((&__pyx_v_cvmat)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":692 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":702 * cvmatptr = cvmat_ptr_from_iplimage(&cvmat) * * c_cvGetQuadrangleSubPix(&srcimg, &outimg, cvmatptr) # <<<<<<<<<<<<<< @@ -5172,7 +5182,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubP */ __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvGetQuadrangleSubPix((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_cvmatptr); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":694 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":704 * c_cvGetQuadrangleSubPix(&srcimg, &outimg, cvmatptr) * * PyMem_Free(cvmatptr) # <<<<<<<<<<<<<< @@ -5181,7 +5191,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubP */ PyMem_Free(__pyx_v_cvmatptr); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":696 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":706 * PyMem_Free(cvmatptr) * * return out # <<<<<<<<<<<<<< @@ -5207,7 +5217,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubP return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":698 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":708 * return out * * def cvResize(np.ndarray src, height=None, width=None, # <<<<<<<<<<<<<< @@ -5273,13 +5283,13 @@ 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 = 698; __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 = 708; __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 = 699; __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 = 709; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_method = __pyx_k_122; } @@ -5288,7 +5298,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject * __pyx_v_width = Py_None; __pyx_v_method = __pyx_k_122; 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 = 699; __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 = 709; __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)); @@ -5298,61 +5308,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 = 698; __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 = 708; __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 = 698; __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 = 708; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":705 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":715 * 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 = 705; __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 = 715; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":707 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":717 * 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 = 707; __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 = 717; __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 = 707; __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 = 717; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_t_4 = (!__pyx_t_3); } else { __pyx_t_4 = (!__pyx_t_2); } if (__pyx_t_4) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":708 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":718 * * 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 = 708; __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 = 718; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_5)); __Pyx_INCREF(__pyx_kp_157); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_kp_157); __Pyx_GIVEREF(__pyx_kp_157); - __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 = 708; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __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 = 718; __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 = 708; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 718; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L6; } __pyx_L6:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":710 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":720 * raise ValueError('width and height must not be none') * * cdef int ndim = src.ndim # <<<<<<<<<<<<<< @@ -5361,7 +5371,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject * */ __pyx_v_ndim = __pyx_v_src->nd; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":711 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":721 * * cdef int ndim = src.ndim * cdef np.npy_intp* shape = clone_array_shape(src) # <<<<<<<<<<<<<< @@ -5370,51 +5380,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); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":712 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":722 * 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 = 712; __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 = 722; __pyx_clineno = __LINE__; goto __pyx_L1_error;} (__pyx_v_shape[0]) = __pyx_t_7; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":713 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":723 * 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 = 713; __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 = 723; __pyx_clineno = __LINE__; goto __pyx_L1_error;} (__pyx_v_shape[1]) = __pyx_t_7; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":715 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":725 * 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 = 715; __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 = 725; __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 = 715; __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 = 725; __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; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":716 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":726 * * 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 = 716; __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 = 726; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":718 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":728 * validate_array(out) * * PyMem_Free(shape) # <<<<<<<<<<<<<< @@ -5423,7 +5433,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject * */ PyMem_Free(__pyx_v_shape); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":722 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":732 * cdef IplImage srcimg * cdef IplImage outimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -5432,7 +5442,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)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":723 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":733 * cdef IplImage outimg * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -5441,7 +5451,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)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":725 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":735 * populate_iplimage(out, &outimg) * * c_cvResize(&srcimg, &outimg, method) # <<<<<<<<<<<<<< @@ -5450,7 +5460,7 @@ 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); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":727 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":737 * c_cvResize(&srcimg, &outimg, method) * * return out # <<<<<<<<<<<<<< @@ -5476,7 +5486,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject * return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":729 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":739 * return out * * def cvWarpAffine(np.ndarray src, np.ndarray warpmat, # <<<<<<<<<<<<<< @@ -5528,7 +5538,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_warpmat); if (likely(values[1])) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("cvWarpAffine", 0, 2, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvWarpAffine", 0, 2, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 739; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 2: if (kw_args > 0) { @@ -5542,12 +5552,12 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvWarpAffine") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvWarpAffine") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 739; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); __pyx_v_warpmat = ((PyArrayObject *)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 = 730; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_flags = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_flags = __pyx_k_124; } @@ -5559,7 +5569,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje case 4: __pyx_v_fillval = PyTuple_GET_ITEM(__pyx_args, 3); 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 = 730; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __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 = 740; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 2: __pyx_v_warpmat = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1)); __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); @@ -5569,34 +5579,34 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvWarpAffine", 0, 2, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvWarpAffine", 0, 2, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 739; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvWarpAffine"); 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 = 729; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_warpmat), __pyx_ptype_5numpy_ndarray, 1, "warpmat", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; __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 = 739; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_warpmat), __pyx_ptype_5numpy_ndarray, 1, "warpmat", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 739; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":746 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":756 * a warped image the same size and dtype as src * ''' * validate_array(src) # <<<<<<<<<<<<<< * validate_array(warpmat) * assert len(fillval) == 4, 'fillval must be a 4-tuple' */ - __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 = 746; __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 = 756; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":747 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":757 * ''' * validate_array(src) * validate_array(warpmat) # <<<<<<<<<<<<<< * assert len(fillval) == 4, 'fillval must be a 4-tuple' * assert_nchannels(src, [1, 3]) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_warpmat); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 747; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_warpmat); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":748 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":758 * validate_array(src) * validate_array(warpmat) * assert len(fillval) == 4, 'fillval must be a 4-tuple' # <<<<<<<<<<<<<< @@ -5604,21 +5614,21 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje * assert_nchannels(warpmat, [1]) */ #ifndef PYREX_WITHOUT_ASSERTIONS - __pyx_t_2 = PyObject_Length(__pyx_v_fillval); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 748; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Length(__pyx_v_fillval); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 758; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (unlikely(!(__pyx_t_2 == 4))) { PyErr_SetObject(PyExc_AssertionError, __pyx_kp_158); - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 748; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 758; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } #endif - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":749 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":759 * validate_array(warpmat) * assert len(fillval) == 4, 'fillval must be a 4-tuple' * assert_nchannels(src, [1, 3]) # <<<<<<<<<<<<<< * assert_nchannels(warpmat, [1]) * assert warpmat.shape[0] == 2, 'warpmat must be 2x3' */ - __pyx_t_3 = PyList_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 749; __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 = 759; __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); @@ -5626,25 +5636,25 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje __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 = 749; __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 = 759; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":750 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":760 * assert len(fillval) == 4, 'fillval must be a 4-tuple' * assert_nchannels(src, [1, 3]) * assert_nchannels(warpmat, [1]) # <<<<<<<<<<<<<< * assert warpmat.shape[0] == 2, 'warpmat must be 2x3' * assert warpmat.shape[1] == 3, 'warpmat must be 2x3' */ - __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 750; __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 = 760; __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); __Pyx_GIVEREF(__pyx_int_1); - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_warpmat, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 750; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_warpmat, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 760; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":751 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":761 * assert_nchannels(src, [1, 3]) * assert_nchannels(warpmat, [1]) * assert warpmat.shape[0] == 2, 'warpmat must be 2x3' # <<<<<<<<<<<<<< @@ -5654,11 +5664,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje #ifndef PYREX_WITHOUT_ASSERTIONS if (unlikely(!((__pyx_v_warpmat->dimensions[0]) == 2))) { PyErr_SetObject(PyExc_AssertionError, __pyx_kp_159); - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 751; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 761; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } #endif - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":752 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":762 * assert_nchannels(warpmat, [1]) * assert warpmat.shape[0] == 2, 'warpmat must be 2x3' * assert warpmat.shape[1] == 3, 'warpmat must be 2x3' # <<<<<<<<<<<<<< @@ -5668,24 +5678,24 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje #ifndef PYREX_WITHOUT_ASSERTIONS if (unlikely(!((__pyx_v_warpmat->dimensions[1]) == 3))) { PyErr_SetObject(PyExc_AssertionError, __pyx_kp_160); - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 752; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 762; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } #endif - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":755 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":765 * * cdef np.ndarray out * out = new_array_like(src) # <<<<<<<<<<<<<< * * cdef CvScalar cvfill */ - __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 = 755; __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 = 765; __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); __pyx_t_3 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":759 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":769 * cdef CvScalar cvfill * cdef int i * for i in range(4): # <<<<<<<<<<<<<< @@ -5695,21 +5705,21 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje for (__pyx_t_1 = 0; __pyx_t_1 < 4; __pyx_t_1+=1) { __pyx_v_i = __pyx_t_1; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":760 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":770 * cdef int i * for i in range(4): * cvfill.val[i] = fillval[i] # <<<<<<<<<<<<<< * * cdef IplImage srcimg */ - __pyx_1 = __Pyx_GetItemInt(__pyx_v_fillval, __pyx_v_i, sizeof(int), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 760; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_fillval, __pyx_v_i, sizeof(int), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 770; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_4 = __pyx_PyFloat_AsDouble(__pyx_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 760; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __pyx_PyFloat_AsDouble(__pyx_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 770; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; (__pyx_v_cvfill.val[__pyx_v_i]) = ((double)__pyx_t_4); } - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":767 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":777 * cdef CvMat* cvmatptr * * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -5718,7 +5728,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje */ __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":768 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":778 * * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -5727,7 +5737,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje */ __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":769 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":779 * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) * populate_iplimage(warpmat, &cvmat) # <<<<<<<<<<<<<< @@ -5736,7 +5746,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_warpmat, (&__pyx_v_cvmat)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":770 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":780 * populate_iplimage(out, &outimg) * populate_iplimage(warpmat, &cvmat) * cvmatptr = cvmat_ptr_from_iplimage(&cvmat) # <<<<<<<<<<<<<< @@ -5745,7 +5755,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje */ __pyx_v_cvmatptr = __pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage((&__pyx_v_cvmat)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":772 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":782 * cvmatptr = cvmat_ptr_from_iplimage(&cvmat) * * c_cvWarpAffine(&srcimg, &outimg, cvmatptr, flags, cvfill) # <<<<<<<<<<<<<< @@ -5754,7 +5764,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje */ __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvWarpAffine((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_cvmatptr, __pyx_v_flags, __pyx_v_cvfill); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":774 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":784 * c_cvWarpAffine(&srcimg, &outimg, cvmatptr, flags, cvfill) * * PyMem_Free(cvmatptr) # <<<<<<<<<<<<<< @@ -5763,7 +5773,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje */ PyMem_Free(__pyx_v_cvmatptr); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":776 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":786 * PyMem_Free(cvmatptr) * * return out # <<<<<<<<<<<<<< @@ -5789,7 +5799,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":778 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":788 * return out * * def cvWarpPerspective(np.ndarray src, np.ndarray warpmat, # <<<<<<<<<<<<<< @@ -5841,7 +5851,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_warpmat); if (likely(values[1])) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("cvWarpPerspective", 0, 2, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 778; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvWarpPerspective", 0, 2, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 788; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 2: if (kw_args > 0) { @@ -5855,12 +5865,12 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvWarpPerspective") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 778; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvWarpPerspective") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 788; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); __pyx_v_warpmat = ((PyArrayObject *)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 = 779; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_flags = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 789; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_flags = __pyx_k_126; } @@ -5872,7 +5882,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P case 4: __pyx_v_fillval = PyTuple_GET_ITEM(__pyx_args, 3); 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 = 779; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __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 = 789; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 2: __pyx_v_warpmat = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1)); __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); @@ -5882,34 +5892,34 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvWarpPerspective", 0, 2, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 778; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvWarpPerspective", 0, 2, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 788; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvWarpPerspective"); 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 = 778; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_warpmat), __pyx_ptype_5numpy_ndarray, 1, "warpmat", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 778; __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 = 788; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_warpmat), __pyx_ptype_5numpy_ndarray, 1, "warpmat", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 788; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":795 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":805 * a warped image the same size and dtype as src * ''' * validate_array(src) # <<<<<<<<<<<<<< * validate_array(warpmat) * assert len(fillval) == 4, 'fillval must be a 4-tuple' */ - __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 = 795; __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 = 805; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":796 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":806 * ''' * validate_array(src) * validate_array(warpmat) # <<<<<<<<<<<<<< * assert len(fillval) == 4, 'fillval must be a 4-tuple' * assert_nchannels(src, [1, 3]) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_warpmat); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 796; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_warpmat); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":797 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":807 * validate_array(src) * validate_array(warpmat) * assert len(fillval) == 4, 'fillval must be a 4-tuple' # <<<<<<<<<<<<<< @@ -5917,21 +5927,21 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P * assert_nchannels(warpmat, [1]) */ #ifndef PYREX_WITHOUT_ASSERTIONS - __pyx_t_2 = PyObject_Length(__pyx_v_fillval); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 797; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Length(__pyx_v_fillval); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (unlikely(!(__pyx_t_2 == 4))) { PyErr_SetObject(PyExc_AssertionError, __pyx_kp_161); - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 797; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } #endif - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":798 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":808 * validate_array(warpmat) * assert len(fillval) == 4, 'fillval must be a 4-tuple' * assert_nchannels(src, [1, 3]) # <<<<<<<<<<<<<< * assert_nchannels(warpmat, [1]) * assert warpmat.shape[0] == 3, 'warpmat must be 3x3' */ - __pyx_t_3 = PyList_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 798; __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 = 808; __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); @@ -5939,25 +5949,25 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P __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 = 798; __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 = 808; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":799 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":809 * assert len(fillval) == 4, 'fillval must be a 4-tuple' * assert_nchannels(src, [1, 3]) * assert_nchannels(warpmat, [1]) # <<<<<<<<<<<<<< * assert warpmat.shape[0] == 3, 'warpmat must be 3x3' * assert warpmat.shape[1] == 3, 'warpmat must be 3x3' */ - __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 799; __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 = 809; __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); __Pyx_GIVEREF(__pyx_int_1); - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_warpmat, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 799; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_warpmat, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 809; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":800 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":810 * assert_nchannels(src, [1, 3]) * assert_nchannels(warpmat, [1]) * assert warpmat.shape[0] == 3, 'warpmat must be 3x3' # <<<<<<<<<<<<<< @@ -5967,11 +5977,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P #ifndef PYREX_WITHOUT_ASSERTIONS if (unlikely(!((__pyx_v_warpmat->dimensions[0]) == 3))) { PyErr_SetObject(PyExc_AssertionError, __pyx_kp_162); - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 800; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 810; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } #endif - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":801 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":811 * assert_nchannels(warpmat, [1]) * assert warpmat.shape[0] == 3, 'warpmat must be 3x3' * assert warpmat.shape[1] == 3, 'warpmat must be 3x3' # <<<<<<<<<<<<<< @@ -5981,24 +5991,24 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P #ifndef PYREX_WITHOUT_ASSERTIONS if (unlikely(!((__pyx_v_warpmat->dimensions[1]) == 3))) { PyErr_SetObject(PyExc_AssertionError, __pyx_kp_163); - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 801; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 811; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } #endif - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":804 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":814 * * cdef np.ndarray out * out = new_array_like(src) # <<<<<<<<<<<<<< * * cdef CvScalar cvfill */ - __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 = 804; __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 = 814; __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); __pyx_t_3 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":808 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":818 * cdef CvScalar cvfill * cdef int i * for i in range(4): # <<<<<<<<<<<<<< @@ -6008,21 +6018,21 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P for (__pyx_t_1 = 0; __pyx_t_1 < 4; __pyx_t_1+=1) { __pyx_v_i = __pyx_t_1; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":809 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":819 * cdef int i * for i in range(4): * cvfill.val[i] = fillval[i] # <<<<<<<<<<<<<< * * cdef IplImage srcimg */ - __pyx_1 = __Pyx_GetItemInt(__pyx_v_fillval, __pyx_v_i, sizeof(int), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 809; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_fillval, __pyx_v_i, sizeof(int), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 819; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_4 = __pyx_PyFloat_AsDouble(__pyx_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 809; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __pyx_PyFloat_AsDouble(__pyx_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 819; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; (__pyx_v_cvfill.val[__pyx_v_i]) = ((double)__pyx_t_4); } - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":814 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":824 * cdef IplImage outimg * cdef IplImage cvmat * cdef CvMat* cvmatptr = NULL # <<<<<<<<<<<<<< @@ -6031,7 +6041,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P */ __pyx_v_cvmatptr = NULL; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":816 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":826 * cdef CvMat* cvmatptr = NULL * * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -6040,7 +6050,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P */ __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":817 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":827 * * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -6049,7 +6059,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P */ __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":818 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":828 * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) * populate_iplimage(warpmat, &cvmat) # <<<<<<<<<<<<<< @@ -6058,7 +6068,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_warpmat, (&__pyx_v_cvmat)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":819 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":829 * populate_iplimage(out, &outimg) * populate_iplimage(warpmat, &cvmat) * cvmatptr = cvmat_ptr_from_iplimage(&cvmat) # <<<<<<<<<<<<<< @@ -6067,7 +6077,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P */ __pyx_v_cvmatptr = __pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage((&__pyx_v_cvmat)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":820 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":830 * populate_iplimage(warpmat, &cvmat) * cvmatptr = cvmat_ptr_from_iplimage(&cvmat) * c_cvWarpPerspective(&srcimg, &outimg, cvmatptr, flags, cvfill) # <<<<<<<<<<<<<< @@ -6076,7 +6086,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P */ __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvWarpPerspective((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_cvmatptr, __pyx_v_flags, __pyx_v_cvfill); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":822 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":832 * c_cvWarpPerspective(&srcimg, &outimg, cvmatptr, flags, cvfill) * * PyMem_Free(cvmatptr) # <<<<<<<<<<<<<< @@ -6085,7 +6095,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P */ PyMem_Free(__pyx_v_cvmatptr); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":824 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":834 * PyMem_Free(cvmatptr) * * return out # <<<<<<<<<<<<<< @@ -6111,7 +6121,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":826 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":836 * return out * * def cvLogPolar(np.ndarray src, center, double M, # <<<<<<<<<<<<<< @@ -6158,13 +6168,13 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLogPolar(PyObject values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_center); if (likely(values[1])) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("cvLogPolar", 0, 3, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 826; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvLogPolar", 0, 3, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 2: values[2] = PyDict_GetItem(__pyx_kwds, __pyx_kp_M); if (likely(values[2])) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("cvLogPolar", 0, 3, 4, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 826; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvLogPolar", 0, 3, 4, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 3: if (kw_args > 0) { @@ -6173,13 +6183,13 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLogPolar(PyObject } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvLogPolar") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 826; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvLogPolar") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); __pyx_v_center = values[1]; - __pyx_v_M = __pyx_PyFloat_AsDouble(values[2]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 826; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_M = __pyx_PyFloat_AsDouble(values[2]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L3_error;} if (values[3]) { - __pyx_v_flags = __Pyx_PyInt_AsInt(values[3]); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_flags = __Pyx_PyInt_AsInt(values[3]); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 837; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_flags = __pyx_k_128; } @@ -6187,9 +6197,9 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLogPolar(PyObject __pyx_v_flags = __pyx_k_128; switch (PyTuple_GET_SIZE(__pyx_args)) { case 4: - __pyx_v_flags = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_flags = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 837; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 3: - __pyx_v_M = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 826; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_M = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_v_center = PyTuple_GET_ITEM(__pyx_args, 1); __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); break; @@ -6198,23 +6208,23 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLogPolar(PyObject } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvLogPolar", 0, 3, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 826; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvLogPolar", 0, 3, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvLogPolar"); 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 = 826; __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 = 836; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":829 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":839 * int flags=CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS): * * validate_array(src) # <<<<<<<<<<<<<< * assert len(center) == 2 * */ - __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 = 829; __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 = 839; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":830 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":840 * * validate_array(src) * assert len(center) == 2 # <<<<<<<<<<<<<< @@ -6222,52 +6232,52 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLogPolar(PyObject * cdef np.ndarray out = new_array_like(src) */ #ifndef PYREX_WITHOUT_ASSERTIONS - __pyx_t_2 = PyObject_Length(__pyx_v_center); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Length(__pyx_v_center); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 840; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (unlikely(!(__pyx_t_2 == 2))) { PyErr_SetNone(PyExc_AssertionError); - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 840; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } #endif - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":832 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":842 * assert len(center) == 2 * * cdef np.ndarray out = new_array_like(src) # <<<<<<<<<<<<<< * * cdef CvPoint2D32f cv_center */ - __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 = 832; __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 = 842; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __pyx_v_out = ((PyArrayObject *)__pyx_t_3); __pyx_t_3 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":835 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":845 * * cdef CvPoint2D32f cv_center * cv_center.x = center[0] # <<<<<<<<<<<<<< * cv_center.y = center[1] * */ - __pyx_1 = __Pyx_GetItemInt(__pyx_v_center, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 835; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_center, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_4 = __pyx_PyFloat_AsDouble(__pyx_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 835; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __pyx_PyFloat_AsDouble(__pyx_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_v_cv_center.x = ((float)__pyx_t_4); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":836 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":846 * cdef CvPoint2D32f cv_center * cv_center.x = center[0] * cv_center.y = center[1] # <<<<<<<<<<<<<< * * cdef IplImage srcimg */ - __pyx_1 = __Pyx_GetItemInt(__pyx_v_center, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_center, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 846; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_4 = __pyx_PyFloat_AsDouble(__pyx_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __pyx_PyFloat_AsDouble(__pyx_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 846; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_v_cv_center.y = ((float)__pyx_t_4); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":840 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":850 * cdef IplImage srcimg * cdef IplImage outimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -6276,7 +6286,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLogPolar(PyObject */ __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":841 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":851 * cdef IplImage outimg * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -6285,7 +6295,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLogPolar(PyObject */ __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":843 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":853 * populate_iplimage(out, &outimg) * * c_cvLogPolar(&srcimg, &outimg, cv_center, M, flags) # <<<<<<<<<<<<<< @@ -6294,7 +6304,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLogPolar(PyObject */ __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvLogPolar((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_cv_center, __pyx_v_M, __pyx_v_flags); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":844 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":854 * * c_cvLogPolar(&srcimg, &outimg, cv_center, M, flags) * return out # <<<<<<<<<<<<<< @@ -6320,7 +6330,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLogPolar(PyObject return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":846 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":856 * return out * * def cvErode(np.ndarray src, np.ndarray element=None, int iterations=1, # <<<<<<<<<<<<<< @@ -6389,12 +6399,12 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *_ } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvErode") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 846; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvErode") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 856; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); __pyx_v_element = ((PyArrayObject *)values[1]); if (values[2]) { - __pyx_v_iterations = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 846; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_iterations = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 856; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_iterations = 1; } @@ -6408,7 +6418,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *_ switch (PyTuple_GET_SIZE(__pyx_args)) { case 5: __pyx_v_in_place = PyTuple_GET_ITEM(__pyx_args, 4); case 4: __pyx_v_anchor = PyTuple_GET_ITEM(__pyx_args, 3); - case 3: __pyx_v_iterations = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 846; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 3: __pyx_v_iterations = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 856; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 2: __pyx_v_element = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1)); case 1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); break; @@ -6417,38 +6427,38 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *_ } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvErode", 0, 1, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 846; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvErode", 0, 1, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 856; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvErode"); 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 = 846; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_element), __pyx_ptype_5numpy_ndarray, 1, "element", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 846; __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 = 856; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_element), __pyx_ptype_5numpy_ndarray, 1, "element", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 856; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":849 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":859 * anchor=None, in_place=False): * * validate_array(src) # <<<<<<<<<<<<<< * * cdef np.ndarray 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 = 849; __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 = 859; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":854 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":864 * cdef IplConvKernel* iplkernel * * if element == None: # <<<<<<<<<<<<<< * iplkernel = NULL * else: */ - __pyx_t_2 = PyObject_RichCompare(((PyObject *)__pyx_v_element), Py_None, Py_EQ); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 854; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_RichCompare(((PyObject *)__pyx_v_element), Py_None, Py_EQ); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 864; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 854; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 864; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; if (__pyx_t_3) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":855 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":865 * * if element == None: * iplkernel = NULL # <<<<<<<<<<<<<< @@ -6460,29 +6470,29 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *_ } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":857 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":867 * iplkernel = NULL * else: * iplkernel = get_IplConvKernel_ptr_from_array(element, anchor) # <<<<<<<<<<<<<< * * if in_place: */ - __pyx_t_4 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_get_IplConvKernel_ptr_from_array(__pyx_v_element, __pyx_v_anchor); if (unlikely(__pyx_t_4 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 857; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_get_IplConvKernel_ptr_from_array(__pyx_v_element, __pyx_v_anchor); if (unlikely(__pyx_t_4 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_v_iplkernel = __pyx_t_4; } __pyx_L6:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":859 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":869 * iplkernel = get_IplConvKernel_ptr_from_array(element, anchor) * * if in_place: # <<<<<<<<<<<<<< * out = src * else: */ - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 859; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 869; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (__pyx_t_3) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":860 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":870 * * if in_place: * out = src # <<<<<<<<<<<<<< @@ -6496,14 +6506,14 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *_ } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":862 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":872 * out = src * else: * out = new_array_like(src) # <<<<<<<<<<<<<< * * cdef IplImage srcimg */ - __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(((PyObject *)__pyx_v_out)); __pyx_v_out = ((PyArrayObject *)__pyx_t_2); @@ -6511,7 +6521,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *_ } __pyx_L7:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":866 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":876 * cdef IplImage srcimg * cdef IplImage outimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -6520,7 +6530,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *_ */ __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":867 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":877 * cdef IplImage outimg * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -6529,7 +6539,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *_ */ __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":869 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":879 * populate_iplimage(out, &outimg) * * c_cvErode(&srcimg, &outimg, iplkernel, iterations) # <<<<<<<<<<<<<< @@ -6538,7 +6548,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *_ */ __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvErode((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_iplkernel, __pyx_v_iterations); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":871 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":881 * c_cvErode(&srcimg, &outimg, iplkernel, iterations) * * free_IplConvKernel(iplkernel) # <<<<<<<<<<<<<< @@ -6547,17 +6557,17 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *_ */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_free_IplConvKernel(__pyx_v_iplkernel); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":873 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":883 * free_IplConvKernel(iplkernel) * * if in_place: # <<<<<<<<<<<<<< * return None * else: */ - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 873; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 883; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (__pyx_t_3) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":874 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":884 * * if in_place: * return None # <<<<<<<<<<<<<< @@ -6572,7 +6582,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *_ } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":876 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":886 * return None * else: * return out # <<<<<<<<<<<<<< @@ -6599,7 +6609,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *_ return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":878 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":888 * return out * * def cvDilate(np.ndarray src, np.ndarray element=None, int iterations=1, # <<<<<<<<<<<<<< @@ -6668,12 +6678,12 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject * } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvDilate") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 878; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvDilate") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 888; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); __pyx_v_element = ((PyArrayObject *)values[1]); if (values[2]) { - __pyx_v_iterations = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 878; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_iterations = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 888; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_iterations = 1; } @@ -6687,7 +6697,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject * switch (PyTuple_GET_SIZE(__pyx_args)) { case 5: __pyx_v_in_place = PyTuple_GET_ITEM(__pyx_args, 4); case 4: __pyx_v_anchor = PyTuple_GET_ITEM(__pyx_args, 3); - case 3: __pyx_v_iterations = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 878; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + case 3: __pyx_v_iterations = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 888; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 2: __pyx_v_element = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1)); case 1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); break; @@ -6696,38 +6706,38 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject * } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvDilate", 0, 1, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 878; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvDilate", 0, 1, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 888; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvDilate"); 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 = 878; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_element), __pyx_ptype_5numpy_ndarray, 1, "element", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 878; __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 = 888; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_element), __pyx_ptype_5numpy_ndarray, 1, "element", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 888; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":881 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":891 * anchor=None, in_place=False): * * validate_array(src) # <<<<<<<<<<<<<< * * cdef np.ndarray 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 = 881; __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 = 891; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":886 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":896 * cdef IplConvKernel* iplkernel * * if element == None: # <<<<<<<<<<<<<< * iplkernel = NULL * else: */ - __pyx_t_2 = PyObject_RichCompare(((PyObject *)__pyx_v_element), Py_None, Py_EQ); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 886; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_RichCompare(((PyObject *)__pyx_v_element), Py_None, Py_EQ); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 896; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 886; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 896; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; if (__pyx_t_3) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":887 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":897 * * if element == None: * iplkernel = NULL # <<<<<<<<<<<<<< @@ -6739,29 +6749,29 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject * } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":889 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":899 * iplkernel = NULL * else: * iplkernel = get_IplConvKernel_ptr_from_array(element, anchor) # <<<<<<<<<<<<<< * * if in_place: */ - __pyx_t_4 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_get_IplConvKernel_ptr_from_array(__pyx_v_element, __pyx_v_anchor); if (unlikely(__pyx_t_4 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 889; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_get_IplConvKernel_ptr_from_array(__pyx_v_element, __pyx_v_anchor); if (unlikely(__pyx_t_4 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 899; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_v_iplkernel = __pyx_t_4; } __pyx_L6:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":891 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":901 * iplkernel = get_IplConvKernel_ptr_from_array(element, anchor) * * if in_place: # <<<<<<<<<<<<<< * out = src * else: */ - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 891; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 901; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (__pyx_t_3) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":892 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":902 * * if in_place: * out = src # <<<<<<<<<<<<<< @@ -6775,14 +6785,14 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject * } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":894 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":904 * out = src * else: * out = new_array_like(src) # <<<<<<<<<<<<<< * * cdef IplImage srcimg */ - __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 894; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 904; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(((PyObject *)__pyx_v_out)); __pyx_v_out = ((PyArrayObject *)__pyx_t_2); @@ -6790,7 +6800,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject * } __pyx_L7:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":898 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":908 * cdef IplImage srcimg * cdef IplImage outimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -6799,7 +6809,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject * */ __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":899 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":909 * cdef IplImage outimg * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -6808,7 +6818,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject * */ __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":901 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":911 * populate_iplimage(out, &outimg) * * c_cvDilate(&srcimg, &outimg, iplkernel, iterations) # <<<<<<<<<<<<<< @@ -6817,7 +6827,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject * */ __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvDilate((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_iplkernel, __pyx_v_iterations); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":903 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":913 * c_cvDilate(&srcimg, &outimg, iplkernel, iterations) * * free_IplConvKernel(iplkernel) # <<<<<<<<<<<<<< @@ -6826,17 +6836,17 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject * */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_free_IplConvKernel(__pyx_v_iplkernel); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":905 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":915 * free_IplConvKernel(iplkernel) * * if in_place: # <<<<<<<<<<<<<< * return None * else: */ - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 905; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 915; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (__pyx_t_3) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":906 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":916 * * if in_place: * return None # <<<<<<<<<<<<<< @@ -6851,7 +6861,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject * } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":908 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":918 * return None * else: * return out # <<<<<<<<<<<<<< @@ -6878,7 +6888,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject * return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":910 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":920 * return out * * def cvMorphologyEx(np.ndarray src, np.ndarray element, int operation, # <<<<<<<<<<<<<< @@ -6937,13 +6947,13 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_element); if (likely(values[1])) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("cvMorphologyEx", 0, 3, 6, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 910; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvMorphologyEx", 0, 3, 6, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 2: values[2] = PyDict_GetItem(__pyx_kwds, __pyx_kp_operation); if (likely(values[2])) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("cvMorphologyEx", 0, 3, 6, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 910; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvMorphologyEx", 0, 3, 6, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 3: if (kw_args > 0) { @@ -6962,13 +6972,13 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvMorphologyEx") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 910; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvMorphologyEx") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); __pyx_v_element = ((PyArrayObject *)values[1]); - __pyx_v_operation = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_operation == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 910; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_operation = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_operation == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; __pyx_clineno = __LINE__; goto __pyx_L3_error;} if (values[3]) { - __pyx_v_iterations = __Pyx_PyInt_AsInt(values[3]); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_iterations = __Pyx_PyInt_AsInt(values[3]); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 921; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_iterations = 1; } @@ -6984,9 +6994,9 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb case 5: __pyx_v_anchor = PyTuple_GET_ITEM(__pyx_args, 4); case 4: - __pyx_v_iterations = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_iterations = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 921; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 3: - __pyx_v_operation = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_operation == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 910; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_operation = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_operation == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_v_element = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1)); __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); break; @@ -6995,46 +7005,46 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvMorphologyEx", 0, 3, 6, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 910; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvMorphologyEx", 0, 3, 6, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvMorphologyEx"); return NULL; __pyx_L4_argument_unpacking_done:; __pyx_v_out = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_v_temp = ((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 = 910; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_element), __pyx_ptype_5numpy_ndarray, 1, "element", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 910; __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 = 920; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_element), __pyx_ptype_5numpy_ndarray, 1, "element", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":913 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":923 * int iterations=1, anchor=None, in_place=False): * * validate_array(src) # <<<<<<<<<<<<<< * * cdef np.ndarray 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 = 913; __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 = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":919 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":929 * cdef IplConvKernel* iplkernel * * iplkernel = get_IplConvKernel_ptr_from_array(element, anchor) # <<<<<<<<<<<<<< * * if in_place: */ - __pyx_t_2 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_get_IplConvKernel_ptr_from_array(__pyx_v_element, __pyx_v_anchor); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 919; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_get_IplConvKernel_ptr_from_array(__pyx_v_element, __pyx_v_anchor); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_v_iplkernel = __pyx_t_2; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":921 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":931 * iplkernel = get_IplConvKernel_ptr_from_array(element, anchor) * * if in_place: # <<<<<<<<<<<<<< * out = src * else: */ - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 921; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (__pyx_t_3) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":922 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":932 * * if in_place: * out = src # <<<<<<<<<<<<<< @@ -7048,14 +7058,14 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":924 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":934 * out = src * 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 = 924; __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 = 934; __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); @@ -7063,7 +7073,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb } __pyx_L6:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":929 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":939 * cdef IplImage outimg * cdef IplImage tempimg * cdef IplImage* tempimgptr = &tempimg # <<<<<<<<<<<<<< @@ -7072,7 +7082,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb */ __pyx_v_tempimgptr = (&__pyx_v_tempimg); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":931 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":941 * cdef IplImage* tempimgptr = &tempimg * * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -7081,7 +7091,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb */ __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":932 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":942 * * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -7090,33 +7100,33 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb */ __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":935 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":945 * * # determine if we need the tempimg * if operation == CV_MOP_OPEN or operation == CV_MOP_CLOSE: # <<<<<<<<<<<<<< * tempimgptr = NULL * elif operation == CV_MOP_GRADIENT: */ - __pyx_t_4 = PyInt_FromLong(__pyx_v_operation); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyInt_FromLong(__pyx_v_operation); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 945; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_MOP_OPEN); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_MOP_OPEN); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 945; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_5 = PyObject_RichCompare(__pyx_t_4, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyObject_RichCompare(__pyx_t_4, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 945; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; __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 = 945; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; if (!__pyx_t_3) { - __pyx_t_5 = PyInt_FromLong(__pyx_v_operation); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyInt_FromLong(__pyx_v_operation); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 945; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_MOP_CLOSE); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_MOP_CLOSE); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 945; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_4 = PyObject_RichCompare(__pyx_t_5, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_RichCompare(__pyx_t_5, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 945; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 945; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __pyx_t_7 = __pyx_t_6; } else { @@ -7124,7 +7134,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb } if (__pyx_t_7) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":936 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":946 * # determine if we need the tempimg * if operation == CV_MOP_OPEN or operation == CV_MOP_CLOSE: * tempimgptr = NULL # <<<<<<<<<<<<<< @@ -7135,39 +7145,39 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb goto __pyx_L7; } - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":937 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":947 * if operation == CV_MOP_OPEN or operation == CV_MOP_CLOSE: * tempimgptr = NULL * elif operation == CV_MOP_GRADIENT: # <<<<<<<<<<<<<< * temp = new_array_like(src) * populate_iplimage(temp, &tempimg) */ - __pyx_t_4 = PyInt_FromLong(__pyx_v_operation); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 937; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyInt_FromLong(__pyx_v_operation); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 947; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_MOP_GRADIENT); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 937; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_MOP_GRADIENT); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 947; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_5 = PyObject_RichCompare(__pyx_t_4, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 937; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyObject_RichCompare(__pyx_t_4, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 947; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 937; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 947; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; if (__pyx_t_7) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":938 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":948 * tempimgptr = NULL * elif operation == CV_MOP_GRADIENT: * temp = new_array_like(src) # <<<<<<<<<<<<<< * populate_iplimage(temp, &tempimg) * elif operation == CV_MOP_TOPHAT or operation == CV_MOP_BLACKHAT: */ - __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 = 938; __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 = 948; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(((PyObject *)__pyx_v_temp)); __pyx_v_temp = ((PyArrayObject *)__pyx_t_5); __pyx_t_5 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":939 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":949 * elif operation == CV_MOP_GRADIENT: * temp = new_array_like(src) * populate_iplimage(temp, &tempimg) # <<<<<<<<<<<<<< @@ -7178,33 +7188,33 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb goto __pyx_L7; } - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":940 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":950 * temp = new_array_like(src) * populate_iplimage(temp, &tempimg) * elif operation == CV_MOP_TOPHAT or operation == CV_MOP_BLACKHAT: # <<<<<<<<<<<<<< * if in_place: * temp = new_array_like(src) */ - __pyx_t_5 = PyInt_FromLong(__pyx_v_operation); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyInt_FromLong(__pyx_v_operation); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_MOP_TOPHAT); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_MOP_TOPHAT); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_4 = PyObject_RichCompare(__pyx_t_5, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_RichCompare(__pyx_t_5, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; if (!__pyx_t_7) { - __pyx_t_4 = PyInt_FromLong(__pyx_v_operation); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyInt_FromLong(__pyx_v_operation); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_MOP_BLACKHAT); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_MOP_BLACKHAT); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_5 = PyObject_RichCompare(__pyx_t_4, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyObject_RichCompare(__pyx_t_4, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; __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 = 950; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_t_6 = __pyx_t_3; } else { @@ -7212,30 +7222,30 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb } if (__pyx_t_6) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":941 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":951 * populate_iplimage(temp, &tempimg) * elif operation == CV_MOP_TOPHAT or operation == CV_MOP_BLACKHAT: * if in_place: # <<<<<<<<<<<<<< * temp = new_array_like(src) * populate_iplimage(temp, &tempimg) */ - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 941; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 951; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (__pyx_t_6) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":942 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":952 * elif operation == CV_MOP_TOPHAT or operation == CV_MOP_BLACKHAT: * if in_place: * temp = new_array_like(src) # <<<<<<<<<<<<<< * populate_iplimage(temp, &tempimg) * else: */ - __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 = 942; __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 = 952; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(((PyObject *)__pyx_v_temp)); __pyx_v_temp = ((PyArrayObject *)__pyx_t_5); __pyx_t_5 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":943 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":953 * if in_place: * temp = new_array_like(src) * populate_iplimage(temp, &tempimg) # <<<<<<<<<<<<<< @@ -7247,7 +7257,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":945 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":955 * populate_iplimage(temp, &tempimg) * else: * tempimgptr = NULL # <<<<<<<<<<<<<< @@ -7261,28 +7271,28 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":947 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":957 * tempimgptr = NULL * else: * raise RuntimeError('operation type not understood') # <<<<<<<<<<<<<< * * c_cvMorphologyEx(&srcimg, &outimg, tempimgptr, iplkernel, operation, */ - __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 947; __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 = 957; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_5)); __Pyx_INCREF(__pyx_kp_164); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_kp_164); __Pyx_GIVEREF(__pyx_kp_164); - __pyx_t_4 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 947; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; __Pyx_Raise(__pyx_t_4, 0, 0); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 947; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } __pyx_L7:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":950 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":960 * * c_cvMorphologyEx(&srcimg, &outimg, tempimgptr, iplkernel, operation, * iterations) # <<<<<<<<<<<<<< @@ -7291,7 +7301,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb */ __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvMorphologyEx((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_tempimgptr, __pyx_v_iplkernel, __pyx_v_operation, __pyx_v_iterations); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":952 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":962 * iterations) * * free_IplConvKernel(iplkernel) # <<<<<<<<<<<<<< @@ -7300,17 +7310,17 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_free_IplConvKernel(__pyx_v_iplkernel); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":954 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":964 * free_IplConvKernel(iplkernel) * * if in_place: # <<<<<<<<<<<<<< * return None * else: */ - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 954; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 964; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (__pyx_t_6) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":955 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":965 * * if in_place: * return None # <<<<<<<<<<<<<< @@ -7325,7 +7335,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":957 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":967 * return None * else: * return out # <<<<<<<<<<<<<< @@ -7355,7 +7365,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":959 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":969 * return out * * def cvSmooth(np.ndarray src, np.ndarray out=None, # <<<<<<<<<<<<<< @@ -7448,32 +7458,32 @@ 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 = 959; __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 = 969; __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 = 960; __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 = 970; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_smoothtype = __pyx_k_132; } 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 = 960; __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 = 970; __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 = 961; __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 = 971; __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 = 961; __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 = 971; __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 = 961; __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 = 971; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_param4 = ((double)0); } @@ -7488,11 +7498,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * __pyx_v_in_place = __pyx_k_133; 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 = 961; __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 = 961; __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 = 961; __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 = 960; __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 = 960; __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 = 971; __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 = 971; __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 = 971; __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 = 970; __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 = 970; __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; @@ -7501,26 +7511,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 = 959; __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 = 969; __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 = 959; __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 = 959; __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 = 962; __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 = 969; __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 = 969; __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 = 972; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":969 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":979 * """ * * 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 = 969; __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 = 979; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":970 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":980 * * validate_array(src) * if out is not None: # <<<<<<<<<<<<<< @@ -7530,83 +7540,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) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":971 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":981 * 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 = 971; __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 = 981; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L6; } __pyx_L6:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":977 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":987 * * # 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 = 977; __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 = 987; __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 = 977; __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 = 987; __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 = 977; __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 = 987; __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 = 977; __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 = 987; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; if (__pyx_t_2) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":979 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":989 * 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 = 979; __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 = 989; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (__pyx_t_2) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":980 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":990 * * 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 = 980; __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 = 990; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_4)); __Pyx_INCREF(__pyx_kp_165); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_kp_165); __Pyx_GIVEREF(__pyx_kp_165); - __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 = 980; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __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 = 990; __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 = 980; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 990; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L8; } __pyx_L8:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":983 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":993 * 'filter') * * assert_dtype(src, [UINT8, INT8, FLOAT32]) # <<<<<<<<<<<<<< * assert_ndims(src, [2]) * */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 983; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 993; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_145); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 983; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_145); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 993; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 983; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 993; __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 = 983; __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 = 993; __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); @@ -7617,25 +7627,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 = 983; __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 = 993; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":984 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":994 * * 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 = 984; __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 = 994; __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 = 984; __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 = 994; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":986 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":996 * assert_ndims(src, [2]) * * if out is not None: # <<<<<<<<<<<<<< @@ -7645,103 +7655,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) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":987 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":997 * * 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 = 987; __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 = 997; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 987; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 997; __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 = 987; __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 = 997; __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 = 987; __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 = 997; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; if (__pyx_t_2) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":988 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":998 * 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_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 988; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 998; __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 = 988; __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 = 998; __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 = 988; __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 = 998; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; goto __pyx_L10; } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":990 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1000 * assert_dtype(out, [FLOAT32]) * else: * assert_dtype(out, [INT16]) # <<<<<<<<<<<<<< * assert_same_shape(src, out) * else: */ - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_147); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 990; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_147); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1000; __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 = 990; __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 = 1000; __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 = 990; __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 = 1000; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; } __pyx_L10:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":991 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1001 * 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 = 991; __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 = 1001; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L9; } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":993 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1003 * 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 = 993; __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 = 1003; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 993; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1003; __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 = 993; __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 = 1003; __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 = 993; __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 = 1003; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; if (__pyx_t_2) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":994 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1004 * 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 = 994; __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 = 1004; __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); @@ -7750,16 +7760,16 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":996 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1006 * 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_147); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 996; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_147); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1006; __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 = 996; __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 = 1006; __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)); @@ -7772,33 +7782,33 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * goto __pyx_L7; } - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":999 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1009 * * # 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 = 999; __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 = 1009; __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 = 999; __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 = 1009; __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 = 999; __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 = 1009; __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 = 999; __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 = 1009; __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 = 999; __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 = 1009; __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 = 999; __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 = 1009; __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 = 999; __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 = 1009; __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 = 999; __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 = 1009; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_t_6 = __pyx_t_5; } else { @@ -7806,20 +7816,20 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * } if (__pyx_t_6) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1001 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1011 * 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_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1001; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1011; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_145); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1001; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_145); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1011; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_3); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1001; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1011; __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 = 1001; __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 = 1011; __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); @@ -7830,17 +7840,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 = 1001; __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 = 1011; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1002 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1012 * * 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 = 1002; __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 = 1012; __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); @@ -7848,20 +7858,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 = 1002; __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 = 1012; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1004 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1014 * 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 = 1004; __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 = 1014; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (__pyx_t_6) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1005 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1015 * * if in_place: * out = src # <<<<<<<<<<<<<< @@ -7874,7 +7884,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * goto __pyx_L12; } - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1006 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1016 * if in_place: * out = src * elif out is not None: # <<<<<<<<<<<<<< @@ -7884,26 +7894,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) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1007 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1017 * 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 = 1007; __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 = 1017; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L12; } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1009 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1019 * 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 = 1009; __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 = 1019; __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); @@ -7914,18 +7924,18 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1013 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1023 * # CV_MEDIAN and CV_BILATERAL * else: * assert_dtype(src, [UINT8, INT8]) # <<<<<<<<<<<<<< * assert_nchannels(src, [1, 3]) * */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1013; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1023; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_145); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1013; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_145); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1023; __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 = 1013; __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 = 1023; __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); @@ -7933,17 +7943,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 = 1013; __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 = 1023; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1014 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1024 * 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 = 1014; __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 = 1024; __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); @@ -7951,42 +7961,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 = 1014; __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 = 1024; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1016 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1026 * 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 = 1016; __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 = 1026; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (__pyx_t_6) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1017 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1027 * * 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 = 1017; __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 = 1027; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_kp_166); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_kp_166); __Pyx_GIVEREF(__pyx_kp_166); - __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 = 1017; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __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 = 1027; __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 = 1017; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1027; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L13; } __pyx_L13:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1020 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1030 * 'filter') * * if out is not None: # <<<<<<<<<<<<<< @@ -7996,26 +8006,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) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1021 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1031 * * 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 = 1021; __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 = 1031; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L14; } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1023 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1033 * 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 = 1023; __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 = 1033; __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); @@ -8025,7 +8035,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * } __pyx_L7:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1027 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1037 * cdef IplImage srcimg * cdef IplImage outimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -8034,7 +8044,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)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1028 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1038 * cdef IplImage outimg * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -8043,7 +8053,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)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1030 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1040 * populate_iplimage(out, &outimg) * * c_cvSmooth(&srcimg, &outimg, smoothtype, param1, param2, param3, param4) # <<<<<<<<<<<<<< @@ -8052,7 +8062,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); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1032 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1042 * c_cvSmooth(&srcimg, &outimg, smoothtype, param1, param2, param3, param4) * * return out # <<<<<<<<<<<<<< @@ -8081,7 +8091,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1034 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1044 * return out * * def cvFilter2D(np.ndarray src, np.ndarray kernel, anchor=None, in_place=False): # <<<<<<<<<<<<<< @@ -8133,7 +8143,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_kernel); if (likely(values[1])) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("cvFilter2D", 0, 2, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1034; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvFilter2D", 0, 2, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1044; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 2: if (kw_args > 0) { @@ -8147,7 +8157,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvFilter2D") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1034; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvFilter2D") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1044; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); __pyx_v_kernel = ((PyArrayObject *)values[1]); @@ -8170,66 +8180,66 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvFilter2D", 0, 2, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1034; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvFilter2D", 0, 2, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1044; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvFilter2D"); 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 = 1034; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_kernel), __pyx_ptype_5numpy_ndarray, 1, "kernel", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1034; __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 = 1044; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_kernel), __pyx_ptype_5numpy_ndarray, 1, "kernel", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1044; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1036 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1046 * def cvFilter2D(np.ndarray src, np.ndarray kernel, anchor=None, in_place=False): * * validate_array(src) # <<<<<<<<<<<<<< * validate_array(kernel) * */ - __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 = 1036; __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 = 1046; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1037 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1047 * * validate_array(src) * validate_array(kernel) # <<<<<<<<<<<<<< * * assert_ndims(kernel, [2]) */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_kernel); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1037; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_kernel); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1039 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1049 * validate_array(kernel) * * assert_ndims(kernel, [2]) # <<<<<<<<<<<<<< * assert_dtype(kernel, [FLOAT32]) * */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1039; __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 = 1049; __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_kernel, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1039; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(__pyx_v_kernel, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1049; __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":1040 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1050 * * assert_ndims(kernel, [2]) * assert_dtype(kernel, [FLOAT32]) # <<<<<<<<<<<<<< * * cdef CvPoint cv_anchor */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1040; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1050; __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 = 1040; __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 = 1050; __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_kernel, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1040; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_kernel, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1050; __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":1043 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1053 * * cdef CvPoint cv_anchor * if anchor is not None: # <<<<<<<<<<<<<< @@ -8239,7 +8249,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject __pyx_t_3 = (__pyx_v_anchor != Py_None); if (__pyx_t_3) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1044 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1054 * cdef CvPoint cv_anchor * if anchor is not None: * assert len(anchor) == 2, 'anchor must be (x, y) tuple' # <<<<<<<<<<<<<< @@ -8247,40 +8257,40 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject * cv_anchor.y = anchor[1] */ #ifndef PYREX_WITHOUT_ASSERTIONS - __pyx_t_4 = PyObject_Length(__pyx_v_anchor); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1044; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_Length(__pyx_v_anchor); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1054; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (unlikely(!(__pyx_t_4 == 2))) { PyErr_SetObject(PyExc_AssertionError, __pyx_kp_167); - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1044; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1054; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } #endif - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1045 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1055 * if anchor is not None: * assert len(anchor) == 2, 'anchor must be (x, y) tuple' * cv_anchor.x = anchor[0] # <<<<<<<<<<<<<< * cv_anchor.y = anchor[1] * assert (cv_anchor.x < kernel.shape[1]) and (cv_anchor.x >= 0) \ */ - __pyx_1 = __Pyx_GetItemInt(__pyx_v_anchor, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1045; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_anchor, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1055; __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 = 1045; __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 = 1055; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_v_cv_anchor.x = ((int)__pyx_t_1); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1046 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1056 * assert len(anchor) == 2, 'anchor must be (x, y) tuple' * cv_anchor.x = anchor[0] * cv_anchor.y = anchor[1] # <<<<<<<<<<<<<< * assert (cv_anchor.x < kernel.shape[1]) and (cv_anchor.x >= 0) \ * and (cv_anchor.y < kernel.shape[0]) and (cv_anchor.y >= 0), \ */ - __pyx_1 = __Pyx_GetItemInt(__pyx_v_anchor, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1046; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_anchor, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1056; __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 = 1046; __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 = 1056; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_v_cv_anchor.y = ((int)__pyx_t_1); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1047 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1057 * cv_anchor.x = anchor[0] * cv_anchor.y = anchor[1] * assert (cv_anchor.x < kernel.shape[1]) and (cv_anchor.x >= 0) \ # <<<<<<<<<<<<<< @@ -8290,7 +8300,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject #ifndef PYREX_WITHOUT_ASSERTIONS if ((__pyx_v_cv_anchor.x < (__pyx_v_kernel->dimensions[1]))) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1048 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1058 * cv_anchor.y = anchor[1] * assert (cv_anchor.x < kernel.shape[1]) and (cv_anchor.x >= 0) \ * and (cv_anchor.y < kernel.shape[0]) and (cv_anchor.y >= 0), \ # <<<<<<<<<<<<<< @@ -8313,7 +8323,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject } if (unlikely(!__pyx_t_3)) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1049 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1059 * assert (cv_anchor.x < kernel.shape[1]) and (cv_anchor.x >= 0) \ * and (cv_anchor.y < kernel.shape[0]) and (cv_anchor.y >= 0), \ * 'anchor point must be inside kernel' # <<<<<<<<<<<<<< @@ -8321,14 +8331,14 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject * cv_anchor.x = (kernel.shape[1] / 2.) */ PyErr_SetObject(PyExc_AssertionError, __pyx_kp_168); - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1057; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } #endif goto __pyx_L6; } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1051 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1061 * 'anchor point must be inside kernel' * else: * cv_anchor.x = (kernel.shape[1] / 2.) # <<<<<<<<<<<<<< @@ -8337,7 +8347,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject */ __pyx_v_cv_anchor.x = ((int)((__pyx_v_kernel->dimensions[1]) / 2.0)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1052 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1062 * else: * cv_anchor.x = (kernel.shape[1] / 2.) * cv_anchor.y = (kernel.shape[0] / 2.) # <<<<<<<<<<<<<< @@ -8348,17 +8358,17 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject } __pyx_L6:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1056 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1066 * cdef np.ndarray out * * if in_place: # <<<<<<<<<<<<<< * out = src * else: */ - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1056; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1066; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (__pyx_t_3) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1057 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1067 * * if in_place: * out = src # <<<<<<<<<<<<<< @@ -8372,14 +8382,14 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1059 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1069 * out = src * else: * out = new_array_like(src) # <<<<<<<<<<<<<< * * cdef IplImage srcimg */ - __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1059; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1069; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(((PyObject *)__pyx_v_out)); __pyx_v_out = ((PyArrayObject *)__pyx_t_2); @@ -8387,7 +8397,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject } __pyx_L7:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1064 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1074 * cdef IplImage outimg * cdef IplImage kernelimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -8396,7 +8406,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject */ __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":1065 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1075 * cdef IplImage kernelimg * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -8405,7 +8415,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject */ __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":1066 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1076 * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) * populate_iplimage(kernel, &kernelimg) # <<<<<<<<<<<<<< @@ -8414,7 +8424,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_kernel, (&__pyx_v_kernelimg)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1069 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1079 * * cdef CvMat* cv_kernel * cv_kernel = cvmat_ptr_from_iplimage(&kernelimg) # <<<<<<<<<<<<<< @@ -8423,7 +8433,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject */ __pyx_v_cv_kernel = __pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage((&__pyx_v_kernelimg)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1071 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1081 * cv_kernel = cvmat_ptr_from_iplimage(&kernelimg) * * c_cvFilter2D(&srcimg, &outimg, cv_kernel, cv_anchor) # <<<<<<<<<<<<<< @@ -8432,7 +8442,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject */ __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvFilter2D((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_cv_kernel, __pyx_v_cv_anchor); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1073 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1083 * c_cvFilter2D(&srcimg, &outimg, cv_kernel, cv_anchor) * * PyMem_Free(cv_kernel) # <<<<<<<<<<<<<< @@ -8441,17 +8451,17 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject */ PyMem_Free(__pyx_v_cv_kernel); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1075 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1085 * PyMem_Free(cv_kernel) * * if in_place: # <<<<<<<<<<<<<< * return None * else: */ - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1075; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1085; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (__pyx_t_3) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1076 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1086 * * if in_place: * return None # <<<<<<<<<<<<<< @@ -8466,7 +8476,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1078 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1088 * return None * else: * return out # <<<<<<<<<<<<<< @@ -8494,7 +8504,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1080 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1090 * return out * * def cvIntegral(np.ndarray src, square_sum=False, tilted_sum=False): # <<<<<<<<<<<<<< @@ -8559,7 +8569,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvIntegral") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1080; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvIntegral") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); __pyx_v_square_sum = values[1]; @@ -8577,7 +8587,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvIntegral", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1080; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvIntegral", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvIntegral"); return NULL; @@ -8586,31 +8596,31 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject __pyx_v_outsum = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_v_outsqsum = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_v_outtiltsum = ((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 = 1080; __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 = 1090; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1082 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1092 * def cvIntegral(np.ndarray src, square_sum=False, tilted_sum=False): * * validate_array(src) # <<<<<<<<<<<<<< * assert_dtype(src, [UINT8, FLOAT32, FLOAT64]) * */ - __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 = 1082; __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 = 1092; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1083 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1093 * * validate_array(src) * assert_dtype(src, [UINT8, FLOAT32, FLOAT64]) # <<<<<<<<<<<<<< * * out = [] */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1083; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1093; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1083; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1093; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_169); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1083; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_169); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1093; __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 = 1083; __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 = 1093; __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); @@ -8621,23 +8631,23 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(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 = 1083; __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 = 1093; __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":1085 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1095 * assert_dtype(src, [UINT8, FLOAT32, FLOAT64]) * * out = [] # <<<<<<<<<<<<<< * * cdef np.ndarray outsum */ - __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1085; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_DECREF(__pyx_v_out); __pyx_v_out = ((PyObject *)__pyx_t_2); __pyx_t_2 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1095 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1105 * cdef IplImage outsqsumimg * cdef IplImage outtiltsumimg * cdef IplImage* outsqsumimgptr = &outsqsumimg # <<<<<<<<<<<<<< @@ -8646,7 +8656,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject */ __pyx_v_outsqsumimgptr = (&__pyx_v_outsqsumimg); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1096 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1106 * cdef IplImage outtiltsumimg * cdef IplImage* outsqsumimgptr = &outsqsumimg * cdef IplImage* outtiltsumimgptr = &outtiltsumimg # <<<<<<<<<<<<<< @@ -8655,7 +8665,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject */ __pyx_v_outtiltsumimgptr = (&__pyx_v_outtiltsumimg); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1098 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1108 * cdef IplImage* outtiltsumimgptr = &outtiltsumimg * * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -8664,7 +8674,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject */ __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":1101 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1111 * * # out arrays need to be (H + 1) x (W + 1) * cdef np.npy_intp* out_shape = clone_array_shape(src) # <<<<<<<<<<<<<< @@ -8673,7 +8683,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject */ __pyx_v_out_shape = __pyx_f_7scikits_5image_6opencv_14opencv_backend_clone_array_shape(__pyx_v_src); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1102 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1112 * # out arrays need to be (H + 1) x (W + 1) * cdef np.npy_intp* out_shape = clone_array_shape(src) * out_shape[0] = src.shape[0] + 1 # <<<<<<<<<<<<<< @@ -8682,7 +8692,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject */ (__pyx_v_out_shape[0]) = ((__pyx_v_src->dimensions[0]) + 1); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1103 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1113 * cdef np.npy_intp* out_shape = clone_array_shape(src) * out_shape[0] = src.shape[0] + 1 * out_shape[1] = src.shape[1] + 1 # <<<<<<<<<<<<<< @@ -8691,7 +8701,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject */ (__pyx_v_out_shape[1]) = ((__pyx_v_src->dimensions[1]) + 1); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1104 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1114 * out_shape[0] = src.shape[0] + 1 * out_shape[1] = src.shape[1] + 1 * cdef int out_dims = src.ndim # <<<<<<<<<<<<<< @@ -8700,35 +8710,35 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject */ __pyx_v_out_dims = __pyx_v_src->nd; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1106 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1116 * cdef int out_dims = src.ndim * * if src.dtype == UINT8: # <<<<<<<<<<<<<< * outsum = new_array(out_dims, out_shape, INT32) * else: */ - __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1106; __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 = 1116; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1106; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1116; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1106; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1116; __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_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1106; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1116; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; if (__pyx_t_4) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1107 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1117 * * if src.dtype == UINT8: * outsum = new_array(out_dims, out_shape, INT32) # <<<<<<<<<<<<<< * else: * outsum = new_array(out_dims, out_shape, FLOAT64) */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_170); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_170); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1117; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(__pyx_v_out_dims, __pyx_v_out_shape, __pyx_2)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(__pyx_v_out_dims, __pyx_v_out_shape, __pyx_2)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1117; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_DECREF(((PyObject *)__pyx_v_outsum)); @@ -8738,16 +8748,16 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1109 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1119 * outsum = new_array(out_dims, out_shape, INT32) * else: * outsum = new_array(out_dims, out_shape, FLOAT64) # <<<<<<<<<<<<<< * * populate_iplimage(outsum, &outsumimg) */ - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_169); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1109; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_169); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1119; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_3); - __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(__pyx_v_out_dims, __pyx_v_out_shape, __pyx_3)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1109; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(__pyx_v_out_dims, __pyx_v_out_shape, __pyx_3)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1119; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_DECREF(((PyObject *)__pyx_v_outsum)); @@ -8756,7 +8766,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject } __pyx_L6:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1111 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1121 * outsum = new_array(out_dims, out_shape, FLOAT64) * * populate_iplimage(outsum, &outsumimg) # <<<<<<<<<<<<<< @@ -8765,44 +8775,44 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_outsum, (&__pyx_v_outsumimg)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1112 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1122 * * populate_iplimage(outsum, &outsumimg) * out.append(outsum) # <<<<<<<<<<<<<< * * if square_sum: */ - __pyx_t_3 = __Pyx_PyObject_Append(__pyx_v_out, ((PyObject *)__pyx_v_outsum)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1112; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_Append(__pyx_v_out, ((PyObject *)__pyx_v_outsum)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1114 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1124 * out.append(outsum) * * if square_sum: # <<<<<<<<<<<<<< * outsqsum = new_array(out_dims, out_shape, FLOAT64) * populate_iplimage(outsqsum, &outsqsumimg) */ - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_v_square_sum); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1114; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_v_square_sum); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (__pyx_t_4) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1115 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1125 * * if square_sum: * outsqsum = new_array(out_dims, out_shape, FLOAT64) # <<<<<<<<<<<<<< * populate_iplimage(outsqsum, &outsqsumimg) * out.append(outsqsum) */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_169); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1115; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_169); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1125; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(__pyx_v_out_dims, __pyx_v_out_shape, __pyx_1)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1115; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(__pyx_v_out_dims, __pyx_v_out_shape, __pyx_1)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1125; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __Pyx_DECREF(((PyObject *)__pyx_v_outsqsum)); __pyx_v_outsqsum = ((PyArrayObject *)__pyx_t_3); __pyx_t_3 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1116 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1126 * if square_sum: * outsqsum = new_array(out_dims, out_shape, FLOAT64) * populate_iplimage(outsqsum, &outsqsumimg) # <<<<<<<<<<<<<< @@ -8811,21 +8821,21 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_outsqsum, (&__pyx_v_outsqsumimg)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1117 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1127 * outsqsum = new_array(out_dims, out_shape, FLOAT64) * populate_iplimage(outsqsum, &outsqsumimg) * out.append(outsqsum) # <<<<<<<<<<<<<< * else: * outsqsumimgptr = NULL */ - __pyx_t_3 = __Pyx_PyObject_Append(__pyx_v_out, ((PyObject *)__pyx_v_outsqsum)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1117; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_Append(__pyx_v_out, ((PyObject *)__pyx_v_outsqsum)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1127; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; goto __pyx_L7; } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1119 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1129 * out.append(outsqsum) * else: * outsqsumimgptr = NULL # <<<<<<<<<<<<<< @@ -8836,33 +8846,33 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject } __pyx_L7:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1121 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1131 * outsqsumimgptr = NULL * * if tilted_sum: # <<<<<<<<<<<<<< * outtiltsum = new_array(out_dims, out_shape, outsum.dtype) * populate_iplimage(outtiltsum, &outtiltsumimg) */ - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_v_tilted_sum); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1121; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_v_tilted_sum); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1131; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (__pyx_t_4) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1122 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1132 * * if tilted_sum: * outtiltsum = new_array(out_dims, out_shape, outsum.dtype) # <<<<<<<<<<<<<< * populate_iplimage(outtiltsum, &outtiltsumimg) * out.append(outtiltsum) */ - __pyx_t_3 = PyObject_GetAttr(((PyObject *)__pyx_v_outsum), __pyx_kp_dtype); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_GetAttr(((PyObject *)__pyx_v_outsum), __pyx_kp_dtype); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1132; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(__pyx_v_out_dims, __pyx_v_out_shape, __pyx_t_3)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(__pyx_v_out_dims, __pyx_v_out_shape, __pyx_t_3)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1132; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(((PyObject *)__pyx_v_outtiltsum)); __pyx_v_outtiltsum = ((PyArrayObject *)__pyx_t_2); __pyx_t_2 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1123 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1133 * if tilted_sum: * outtiltsum = new_array(out_dims, out_shape, outsum.dtype) * populate_iplimage(outtiltsum, &outtiltsumimg) # <<<<<<<<<<<<<< @@ -8871,21 +8881,21 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_outtiltsum, (&__pyx_v_outtiltsumimg)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1124 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1134 * outtiltsum = new_array(out_dims, out_shape, outsum.dtype) * populate_iplimage(outtiltsum, &outtiltsumimg) * out.append(outtiltsum) # <<<<<<<<<<<<<< * else: * outtiltsumimgptr = NULL */ - __pyx_t_2 = __Pyx_PyObject_Append(__pyx_v_out, ((PyObject *)__pyx_v_outtiltsum)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_Append(__pyx_v_out, ((PyObject *)__pyx_v_outtiltsum)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; goto __pyx_L8; } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1126 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1136 * out.append(outtiltsum) * else: * outtiltsumimgptr = NULL # <<<<<<<<<<<<<< @@ -8896,7 +8906,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject } __pyx_L8:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1128 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1138 * outtiltsumimgptr = NULL * * c_cvIntegral(&srcimg, &outsumimg, outsqsumimgptr, outtiltsumimgptr) # <<<<<<<<<<<<<< @@ -8905,7 +8915,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject */ __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvIntegral((&__pyx_v_srcimg), (&__pyx_v_outsumimg), __pyx_v_outsqsumimgptr, __pyx_v_outtiltsumimgptr); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1130 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1140 * c_cvIntegral(&srcimg, &outsumimg, outsqsumimgptr, outtiltsumimgptr) * * PyMem_Free(out_shape) # <<<<<<<<<<<<<< @@ -8914,7 +8924,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject */ PyMem_Free(__pyx_v_out_shape); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1132 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1142 * PyMem_Free(out_shape) * * return out # <<<<<<<<<<<<<< @@ -8946,7 +8956,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1134 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1144 * return out * * def cvCvtColor(np.ndarray src, int code): # <<<<<<<<<<<<<< @@ -8998,23 +9008,23 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(PyObject values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_code); if (likely(values[1])) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("cvCvtColor", 1, 2, 2, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvCvtColor", 1, 2, 2, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1144; __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), "cvCvtColor") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvCvtColor") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1144; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); - __pyx_v_code = __Pyx_PyInt_AsInt(values[1]); if (unlikely((__pyx_v_code == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_code = __Pyx_PyInt_AsInt(values[1]); if (unlikely((__pyx_v_code == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1144; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else if (PyTuple_GET_SIZE(__pyx_args) != 2) { goto __pyx_L5_argtuple_error; } else { __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); - __pyx_v_code = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_code == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_code = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_code == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1144; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvCvtColor", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvCvtColor", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1144; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvCvtColor"); return NULL; @@ -9022,31 +9032,31 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(PyObject __pyx_v_conversion_params = Py_None; __Pyx_INCREF(Py_None); __pyx_v_src_dtypes = Py_None; __Pyx_INCREF(Py_None); __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 = 1134; __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 = 1144; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1136 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1146 * def cvCvtColor(np.ndarray src, int code): * * validate_array(src) # <<<<<<<<<<<<<< * assert_dtype(src, [UINT8, UINT16, 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 = 1136; __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 = 1146; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1137 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1147 * * validate_array(src) * assert_dtype(src, [UINT8, UINT16, FLOAT32]) # <<<<<<<<<<<<<< * * try: */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1147; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1147; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1147; __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 = 1137; __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 = 1147; __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); @@ -9057,10 +9067,10 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(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 = 1137; __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 = 1147; __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":1139 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1149 * assert_dtype(src, [UINT8, UINT16, FLOAT32]) * * try: # <<<<<<<<<<<<<< @@ -9075,16 +9085,16 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(PyObject __Pyx_XGOTREF(__pyx_save_exc_tb); /*try:*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1140 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1150 * * try: * conversion_params = _cvtcolor_dict[code] # <<<<<<<<<<<<<< * except KeyError: * print 'unknown conversion code' */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp__cvtcolor_dict); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1140; __pyx_clineno = __LINE__; goto __pyx_L6_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp__cvtcolor_dict); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1150; __pyx_clineno = __LINE__; goto __pyx_L6_error;} __Pyx_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetItemInt(__pyx_1, __pyx_v_code, sizeof(int), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1140; __pyx_clineno = __LINE__; goto __pyx_L6_error;} + __pyx_2 = __Pyx_GetItemInt(__pyx_1, __pyx_v_code, sizeof(int), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1150; __pyx_clineno = __LINE__; goto __pyx_L6_error;} __Pyx_GOTREF(__pyx_2); __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __Pyx_DECREF(__pyx_v_conversion_params); @@ -9101,7 +9111,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(PyObject __Pyx_XDECREF(__pyx_2); __pyx_2 = 0; __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1141 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1151 * try: * conversion_params = _cvtcolor_dict[code] * except KeyError: # <<<<<<<<<<<<<< @@ -9111,21 +9121,21 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(PyObject __pyx_4 = PyErr_ExceptionMatches(__pyx_builtin_KeyError); if (__pyx_4) { __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvCvtColor"); - if (__Pyx_GetException(&__pyx_t_2, &__pyx_t_3, &__pyx_t_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1141; __pyx_clineno = __LINE__; goto __pyx_L8_except_error;} + if (__Pyx_GetException(&__pyx_t_2, &__pyx_t_3, &__pyx_t_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1151; __pyx_clineno = __LINE__; goto __pyx_L8_except_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_GOTREF(__pyx_t_3); __Pyx_GOTREF(__pyx_t_4); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1142 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1152 * conversion_params = _cvtcolor_dict[code] * except KeyError: * print 'unknown conversion code' # <<<<<<<<<<<<<< * raise * */ - if (__Pyx_PrintOne(__pyx_kp_171) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1142; __pyx_clineno = __LINE__; goto __pyx_L8_except_error;} + if (__Pyx_PrintOne(__pyx_kp_171) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1152; __pyx_clineno = __LINE__; goto __pyx_L8_except_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1143 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1153 * except KeyError: * print 'unknown conversion code' * raise # <<<<<<<<<<<<<< @@ -9133,7 +9143,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(PyObject * cdef int src_channels = conversion_params[0] */ __Pyx_Raise(__pyx_t_2, __pyx_t_3, __pyx_t_4); - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1143; __pyx_clineno = __LINE__; goto __pyx_L8_except_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1153; __pyx_clineno = __LINE__; goto __pyx_L8_except_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; @@ -9152,67 +9162,67 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(PyObject __pyx_L13_try_end:; } - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1145 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1155 * raise * * cdef int src_channels = conversion_params[0] # <<<<<<<<<<<<<< * cdef int out_channels = conversion_params[1] * src_dtypes = conversion_params[2] */ - __pyx_3 = __Pyx_GetItemInt(__pyx_v_conversion_params, 0, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetItemInt(__pyx_v_conversion_params, 0, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1155; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_3); - __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_3); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_3); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1155; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_3); __pyx_3 = 0; __pyx_v_src_channels = ((int)__pyx_t_1); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1146 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1156 * * cdef int src_channels = conversion_params[0] * cdef int out_channels = conversion_params[1] # <<<<<<<<<<<<<< * src_dtypes = conversion_params[2] * */ - __pyx_1 = __Pyx_GetItemInt(__pyx_v_conversion_params, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_conversion_params, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1156; __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 = 1146; __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 = 1156; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_v_out_channels = ((int)__pyx_t_1); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1147 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1157 * cdef int src_channels = conversion_params[0] * cdef int out_channels = conversion_params[1] * src_dtypes = conversion_params[2] # <<<<<<<<<<<<<< * * assert_nchannels(src, src_channels) */ - __pyx_2 = __Pyx_GetItemInt(__pyx_v_conversion_params, 2, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1147; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetItemInt(__pyx_v_conversion_params, 2, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1157; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); __Pyx_DECREF(__pyx_v_src_dtypes); __pyx_v_src_dtypes = __pyx_2; __pyx_2 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1149 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1159 * src_dtypes = conversion_params[2] * * assert_nchannels(src, src_channels) # <<<<<<<<<<<<<< * assert_dtype(src, src_dtypes) * */ - __pyx_t_4 = PyInt_FromLong(__pyx_v_src_channels); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1149; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyInt_FromLong(__pyx_v_src_channels); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1159; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, __pyx_t_4); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1149; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, __pyx_t_4); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1159; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1150 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1160 * * assert_nchannels(src, src_channels) * assert_dtype(src, src_dtypes) # <<<<<<<<<<<<<< * * cdef np.ndarray out */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, __pyx_v_src_dtypes); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, __pyx_v_src_dtypes); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1160; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1158 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1168 * cdef np.npy_intp out_shape2[2] * cdef np.npy_intp out_shape3[3] * out_shape2[0] = src.shape[0] # <<<<<<<<<<<<<< @@ -9221,7 +9231,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(PyObject */ (__pyx_v_out_shape2[0]) = (__pyx_v_src->dimensions[0]); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1159 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1169 * cdef np.npy_intp out_shape3[3] * out_shape2[0] = src.shape[0] * out_shape2[1] = src.shape[1] # <<<<<<<<<<<<<< @@ -9230,7 +9240,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(PyObject */ (__pyx_v_out_shape2[1]) = (__pyx_v_src->dimensions[1]); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1160 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1170 * out_shape2[0] = src.shape[0] * out_shape2[1] = src.shape[1] * out_shape3[0] = src.shape[0] # <<<<<<<<<<<<<< @@ -9239,7 +9249,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(PyObject */ (__pyx_v_out_shape3[0]) = (__pyx_v_src->dimensions[0]); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1161 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1171 * out_shape2[1] = src.shape[1] * out_shape3[0] = src.shape[0] * out_shape3[1] = src.shape[1] # <<<<<<<<<<<<<< @@ -9248,7 +9258,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(PyObject */ (__pyx_v_out_shape3[1]) = (__pyx_v_src->dimensions[1]); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1163 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1173 * out_shape3[1] = src.shape[1] * * if out_channels == 1: # <<<<<<<<<<<<<< @@ -9258,16 +9268,16 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(PyObject __pyx_t_5 = (__pyx_v_out_channels == 1); if (__pyx_t_5) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1164 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1174 * * if out_channels == 1: * out = new_array(2, out_shape2, src.dtype) # <<<<<<<<<<<<<< * else: * out_shape3[2] = out_channels */ - __pyx_t_4 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1164; __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 = 1174; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); - __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(2, __pyx_v_out_shape2, __pyx_t_4)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1164; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(2, __pyx_v_out_shape2, __pyx_t_4)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1174; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(((PyObject *)__pyx_v_out)); @@ -9277,7 +9287,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(PyObject } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1166 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1176 * out = new_array(2, out_shape2, src.dtype) * else: * out_shape3[2] = out_channels # <<<<<<<<<<<<<< @@ -9286,16 +9296,16 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(PyObject */ (__pyx_v_out_shape3[2]) = ((npy_intp)__pyx_v_out_channels); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1167 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1177 * else: * out_shape3[2] = out_channels * out = new_array(3, out_shape3, src.dtype) # <<<<<<<<<<<<<< * * cdef IplImage srcimg */ - __pyx_t_3 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1167; __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 = 1177; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(3, __pyx_v_out_shape3, __pyx_t_3)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(3, __pyx_v_out_shape3, __pyx_t_3)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1177; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(((PyObject *)__pyx_v_out)); @@ -9304,7 +9314,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(PyObject } __pyx_L16:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1171 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1181 * cdef IplImage srcimg * cdef IplImage outimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -9313,7 +9323,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(PyObject */ __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":1172 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1182 * cdef IplImage outimg * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -9322,7 +9332,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(PyObject */ __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":1174 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1184 * populate_iplimage(out, &outimg) * * c_cvCvtColor(&srcimg, &outimg, code) # <<<<<<<<<<<<<< @@ -9331,7 +9341,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(PyObject */ __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCvtColor((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_code); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1176 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1186 * c_cvCvtColor(&srcimg, &outimg, code) * * return out # <<<<<<<<<<<<<< @@ -9363,7 +9373,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(PyObject return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1178 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1188 * return out * * def cvThreshold(np.ndarray src, double threshold, double max_value=255, # <<<<<<<<<<<<<< @@ -9413,7 +9423,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvThreshold(PyObjec values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_threshold); if (likely(values[1])) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("cvThreshold", 0, 2, 5, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvThreshold", 0, 2, 5, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1188; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 2: if (kw_args > 0) { @@ -9432,17 +9442,17 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvThreshold(PyObjec } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvThreshold") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvThreshold") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1188; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); - __pyx_v_threshold = __pyx_PyFloat_AsDouble(values[1]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_threshold = __pyx_PyFloat_AsDouble(values[1]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1188; __pyx_clineno = __LINE__; goto __pyx_L3_error;} if (values[2]) { - __pyx_v_max_value = __pyx_PyFloat_AsDouble(values[2]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_max_value = __pyx_PyFloat_AsDouble(values[2]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1188; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_max_value = ((double)255); } if (values[3]) { - __pyx_v_threshold_type = __Pyx_PyInt_AsInt(values[3]); if (unlikely((__pyx_v_threshold_type == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1179; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_threshold_type = __Pyx_PyInt_AsInt(values[3]); if (unlikely((__pyx_v_threshold_type == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1189; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_threshold_type = __pyx_k_137; } @@ -9455,11 +9465,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvThreshold(PyObjec case 5: __pyx_v_use_otsu = PyTuple_GET_ITEM(__pyx_args, 4); case 4: - __pyx_v_threshold_type = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely((__pyx_v_threshold_type == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1179; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_threshold_type = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely((__pyx_v_threshold_type == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1189; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 3: - __pyx_v_max_value = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_max_value = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1188; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 2: - __pyx_v_threshold = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_threshold = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1188; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); break; default: goto __pyx_L5_argtuple_error; @@ -9467,49 +9477,49 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvThreshold(PyObjec } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvThreshold", 0, 2, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvThreshold", 0, 2, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1188; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvThreshold"); 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 = 1178; __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 = 1188; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1181 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1191 * int threshold_type=CV_THRESH_BINARY, use_otsu=False): * * 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 = 1181; __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 = 1191; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1182 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1192 * * 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 = 1182; __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 = 1192; __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 = 1182; __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 = 1192; __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":1183 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1193 * validate_array(src) * assert_nchannels(src, [1]) * assert_dtype(src, [UINT8, FLOAT32]) # <<<<<<<<<<<<<< * * if use_otsu: */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1183; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1193; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1183; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1193; __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 = 1183; __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 = 1193; __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); @@ -9517,37 +9527,37 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvThreshold(PyObjec __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 = 1183; __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 = 1193; __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":1185 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1195 * assert_dtype(src, [UINT8, FLOAT32]) * * if use_otsu: # <<<<<<<<<<<<<< * assert_dtype(src, [UINT8]) * threshold_type += 8 */ - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_use_otsu); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1185; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_use_otsu); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1195; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (__pyx_t_3) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1186 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1196 * * if use_otsu: * assert_dtype(src, [UINT8]) # <<<<<<<<<<<<<< * threshold_type += 8 * */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1186; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1196; __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 = 1186; __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 = 1196; __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 = 1186; __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 = 1196; __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":1187 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1197 * if use_otsu: * assert_dtype(src, [UINT8]) * threshold_type += 8 # <<<<<<<<<<<<<< @@ -9559,19 +9569,19 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvThreshold(PyObjec } __pyx_L6:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1189 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1199 * threshold_type += 8 * * cdef np.ndarray out = new_array_like(src) # <<<<<<<<<<<<<< * * cdef IplImage srcimg */ - __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1189; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1199; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __pyx_v_out = ((PyArrayObject *)__pyx_t_2); __pyx_t_2 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1193 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1203 * cdef IplImage srcimg * cdef IplImage outimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -9580,7 +9590,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvThreshold(PyObjec */ __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":1194 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1204 * cdef IplImage outimg * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -9589,7 +9599,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvThreshold(PyObjec */ __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":1197 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1207 * * threshold = c_cvThreshold(&srcimg, &outimg, threshold, max_value, * threshold_type) # <<<<<<<<<<<<<< @@ -9598,17 +9608,17 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvThreshold(PyObjec */ __pyx_v_threshold = __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvThreshold((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_threshold, __pyx_v_max_value, __pyx_v_threshold_type); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1199 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1209 * threshold_type) * * if use_otsu: # <<<<<<<<<<<<<< * return (out, threshold) * else: */ - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_use_otsu); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1199; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_use_otsu); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1209; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (__pyx_t_3) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1200 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1210 * * if use_otsu: * return (out, threshold) # <<<<<<<<<<<<<< @@ -9616,9 +9626,9 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvThreshold(PyObjec * return out */ __Pyx_XDECREF(__pyx_r); - __pyx_t_2 = PyFloat_FromDouble(__pyx_v_threshold); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1200; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyFloat_FromDouble(__pyx_v_threshold); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1210; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1200; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1210; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_4)); __Pyx_INCREF(((PyObject *)__pyx_v_out)); PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_v_out)); @@ -9633,7 +9643,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvThreshold(PyObjec } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1202 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1212 * return (out, threshold) * else: * return out # <<<<<<<<<<<<<< @@ -9663,7 +9673,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvThreshold(PyObjec return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1204 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1214 * return out * * def cvAdaptiveThreshold(np.ndarray src, double max_value, # <<<<<<<<<<<<<< @@ -9715,7 +9725,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvAdaptiveThreshold values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_max_value); if (likely(values[1])) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("cvAdaptiveThreshold", 0, 2, 6, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1204; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvAdaptiveThreshold", 0, 2, 6, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 2: if (kw_args > 0) { @@ -9739,27 +9749,27 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvAdaptiveThreshold } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvAdaptiveThreshold") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1204; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvAdaptiveThreshold") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); - __pyx_v_max_value = __pyx_PyFloat_AsDouble(values[1]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1204; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_max_value = __pyx_PyFloat_AsDouble(values[1]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; __pyx_clineno = __LINE__; goto __pyx_L3_error;} if (values[2]) { - __pyx_v_adaptive_method = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_adaptive_method == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1205; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_adaptive_method = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_adaptive_method == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1215; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_adaptive_method = __pyx_k_140; } if (values[3]) { - __pyx_v_threshold_type = __Pyx_PyInt_AsInt(values[3]); if (unlikely((__pyx_v_threshold_type == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1206; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_threshold_type = __Pyx_PyInt_AsInt(values[3]); if (unlikely((__pyx_v_threshold_type == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1216; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_threshold_type = __pyx_k_141; } if (values[4]) { - __pyx_v_block_size = __Pyx_PyInt_AsInt(values[4]); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1207; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_block_size = __Pyx_PyInt_AsInt(values[4]); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1217; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_block_size = 3; } if (values[5]) { - __pyx_v_param1 = __pyx_PyFloat_AsDouble(values[5]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1207; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_param1 = __pyx_PyFloat_AsDouble(values[5]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1217; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_param1 = ((double)5); } @@ -9770,15 +9780,15 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvAdaptiveThreshold __pyx_v_param1 = ((double)5); switch (PyTuple_GET_SIZE(__pyx_args)) { case 6: - __pyx_v_param1 = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 5)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1207; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_param1 = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 5)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1217; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 5: - __pyx_v_block_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 4)); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1207; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_block_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 4)); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1217; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 4: - __pyx_v_threshold_type = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely((__pyx_v_threshold_type == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1206; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_threshold_type = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely((__pyx_v_threshold_type == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1216; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 3: - __pyx_v_adaptive_method = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_adaptive_method == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1205; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_adaptive_method = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_adaptive_method == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1215; __pyx_clineno = __LINE__; goto __pyx_L3_error;} case 2: - __pyx_v_max_value = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1204; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_max_value = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0)); break; default: goto __pyx_L5_argtuple_error; @@ -9786,89 +9796,89 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvAdaptiveThreshold } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvAdaptiveThreshold", 0, 2, 6, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1204; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvAdaptiveThreshold", 0, 2, 6, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvAdaptiveThreshold"); 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 = 1204; __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 = 1214; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1209 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1219 * int block_size=3, double param1=5): * * validate_array(src) # <<<<<<<<<<<<<< * assert_nchannels(src, [1]) * assert_dtype(src, [UINT8]) */ - __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 = 1209; __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 = 1219; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1210 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1220 * * validate_array(src) * 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 = 1210; __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 = 1220; __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 = 1210; __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 = 1220; __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":1211 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1221 * validate_array(src) * assert_nchannels(src, [1]) * assert_dtype(src, [UINT8]) # <<<<<<<<<<<<<< * * if (adaptive_method!=CV_ADAPTIVE_THRESH_MEAN_C and */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1211; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1221; __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 = 1211; __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 = 1221; __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 = 1211; __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 = 1221; __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":1213 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1223 * assert_dtype(src, [UINT8]) * * if (adaptive_method!=CV_ADAPTIVE_THRESH_MEAN_C and # <<<<<<<<<<<<<< * adaptive_method!=CV_ADAPTIVE_THRESH_GAUSSIAN_C): * raise ValueError('Invalid adaptive method') */ - __pyx_t_2 = PyInt_FromLong(__pyx_v_adaptive_method); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1213; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyInt_FromLong(__pyx_v_adaptive_method); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_139); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1213; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_139); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_1, Py_NE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1213; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_1, Py_NE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; __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_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1213; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; if (__pyx_t_4) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1214 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1224 * * if (adaptive_method!=CV_ADAPTIVE_THRESH_MEAN_C and * adaptive_method!=CV_ADAPTIVE_THRESH_GAUSSIAN_C): # <<<<<<<<<<<<<< * raise ValueError('Invalid adaptive method') * */ - __pyx_t_3 = PyInt_FromLong(__pyx_v_adaptive_method); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyInt_FromLong(__pyx_v_adaptive_method); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1224; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_172); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_172); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1224; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_1, Py_NE); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_1, Py_NE); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1224; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1224; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_t_6 = __pyx_t_5; } else { @@ -9876,63 +9886,63 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvAdaptiveThreshold } if (__pyx_t_6) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1215 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1225 * if (adaptive_method!=CV_ADAPTIVE_THRESH_MEAN_C and * adaptive_method!=CV_ADAPTIVE_THRESH_GAUSSIAN_C): * raise ValueError('Invalid adaptive method') # <<<<<<<<<<<<<< * * if (threshold_type!=CV_THRESH_BINARY and */ - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1215; __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 = 1225; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_kp_173); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_173); __Pyx_GIVEREF(__pyx_kp_173); - __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1215; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1225; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __Pyx_Raise(__pyx_t_3, 0, 0); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1215; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1225; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L6; } __pyx_L6:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1217 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1227 * raise ValueError('Invalid adaptive method') * * if (threshold_type!=CV_THRESH_BINARY and # <<<<<<<<<<<<<< * threshold_type!=CV_THRESH_BINARY_INV): * raise ValueError('Invalid threshold type') */ - __pyx_t_3 = PyInt_FromLong(__pyx_v_threshold_type); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1217; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyInt_FromLong(__pyx_v_threshold_type); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1227; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_THRESH_BINARY); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1217; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_THRESH_BINARY); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1227; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_1, Py_NE); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1217; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_1, Py_NE); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1227; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1217; __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 = 1227; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; if (__pyx_t_6) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1218 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1228 * * if (threshold_type!=CV_THRESH_BINARY and * threshold_type!=CV_THRESH_BINARY_INV): # <<<<<<<<<<<<<< * raise ValueError('Invalid threshold type') * */ - __pyx_t_2 = PyInt_FromLong(__pyx_v_threshold_type); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1218; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyInt_FromLong(__pyx_v_threshold_type); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1228; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_174); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1218; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_174); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1228; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_1, Py_NE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1218; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_1, Py_NE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1228; __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_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1218; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1228; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_t_5 = __pyx_t_4; } else { @@ -9940,29 +9950,29 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvAdaptiveThreshold } if (__pyx_t_5) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1219 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1229 * if (threshold_type!=CV_THRESH_BINARY and * threshold_type!=CV_THRESH_BINARY_INV): * raise ValueError('Invalid threshold type') # <<<<<<<<<<<<<< * * if (block_size % 2 != 1 or block_size <= 1): */ - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1219; __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 = 1229; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_kp_175); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_kp_175); __Pyx_GIVEREF(__pyx_kp_175); - __pyx_t_2 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1219; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1229; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; __Pyx_Raise(__pyx_t_2, 0, 0); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1219; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1229; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L7; } __pyx_L7:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1221 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1231 * raise ValueError('Invalid threshold type') * * if (block_size % 2 != 1 or block_size <= 1): # <<<<<<<<<<<<<< @@ -9976,41 +9986,41 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvAdaptiveThreshold } if (__pyx_t_5) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1222 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1232 * * if (block_size % 2 != 1 or block_size <= 1): * raise ValueError('block size must be and odd number and greater than 1') # <<<<<<<<<<<<<< * * cdef np.ndarray out = new_array_like(src) */ - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; __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 = 1232; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(__pyx_kp_176); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_176); __Pyx_GIVEREF(__pyx_kp_176); - __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1232; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; __Pyx_Raise(__pyx_t_3, 0, 0); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1232; __pyx_clineno = __LINE__; goto __pyx_L1_error;} goto __pyx_L8; } __pyx_L8:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1224 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1234 * raise ValueError('block size must be and odd number and greater than 1') * * cdef np.ndarray out = new_array_like(src) # <<<<<<<<<<<<<< * * cdef IplImage srcimg */ - __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 = 1224; __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 = 1234; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __pyx_v_out = ((PyArrayObject *)__pyx_t_3); __pyx_t_3 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1228 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1238 * cdef IplImage srcimg * cdef IplImage outimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -10019,7 +10029,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvAdaptiveThreshold */ __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":1229 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1239 * cdef IplImage outimg * populate_iplimage(src, &srcimg) * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -10028,7 +10038,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvAdaptiveThreshold */ __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":1232 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1242 * * c_cvAdaptiveThreshold(&srcimg, &outimg, max_value, adaptive_method, * threshold_type, block_size, param1) # <<<<<<<<<<<<<< @@ -10037,12 +10047,12 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvAdaptiveThreshold */ __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvAdaptiveThreshold((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_max_value, __pyx_v_adaptive_method, __pyx_v_threshold_type, __pyx_v_block_size, __pyx_v_param1); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1234 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1244 * threshold_type, block_size, param1) * * return out # <<<<<<<<<<<<<< * - * def cvCalibrateCamera2(np.ndarray object_points, np.ndarray image_points, + * def cvPyrDown(np.ndarray src): */ __Pyx_XDECREF(__pyx_r); __Pyx_INCREF(((PyObject *)__pyx_v_out)); @@ -10064,7 +10074,377 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvAdaptiveThreshold return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1236 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1246 + * return out + * + * def cvPyrDown(np.ndarray src): # <<<<<<<<<<<<<< + * + * validate_array(src) + */ + +static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPyrDown(PyObject *__pyx_self, PyObject *__pyx_v_src); /*proto*/ +static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPyrDown(PyObject *__pyx_self, PyObject *__pyx_v_src) { + int __pyx_v_outdim; + npy_intp *__pyx_v_outshape; + PyArrayObject *__pyx_v_out = 0; + __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_srcimg; + __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_outimg; + PyObject *__pyx_r = NULL; + PyObject *__pyx_1 = 0; + PyObject *__pyx_2 = 0; + PyObject *__pyx_3 = 0; + PyObject *__pyx_4 = 0; + int __pyx_t_1; + PyObject *__pyx_t_2 = NULL; + PyObject *__pyx_t_3 = NULL; + __Pyx_SetupRefcountContext("cvPyrDown"); + __pyx_self = __pyx_self; + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1246; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1248 + * def cvPyrDown(np.ndarray src): + * + * validate_array(src) # <<<<<<<<<<<<<< + * assert_dtype(src, [UINT8, UINT16, FLOAT32, FLOAT64]) + * + */ + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(((PyArrayObject *)__pyx_v_src)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1248; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1249 + * + * validate_array(src) + * assert_dtype(src, [UINT8, UINT16, FLOAT32, FLOAT64]) # <<<<<<<<<<<<<< + * + * cdef int outdim = src.ndim + */ + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1249; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_1); + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1249; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_2); + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1249; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_3); + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_169); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1249; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_4); + __pyx_t_2 = PyList_New(4); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1249; __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); + PyList_SET_ITEM(__pyx_t_2, 1, __pyx_2); + __Pyx_GIVEREF(__pyx_2); + PyList_SET_ITEM(__pyx_t_2, 2, __pyx_3); + __Pyx_GIVEREF(__pyx_3); + PyList_SET_ITEM(__pyx_t_2, 3, __pyx_4); + __Pyx_GIVEREF(__pyx_4); + __pyx_1 = 0; + __pyx_2 = 0; + __pyx_3 = 0; + __pyx_4 = 0; + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(((PyArrayObject *)__pyx_v_src), ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1249; __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":1251 + * assert_dtype(src, [UINT8, UINT16, FLOAT32, FLOAT64]) + * + * cdef int outdim = src.ndim # <<<<<<<<<<<<<< + * cdef np.npy_intp* outshape = clone_array_shape(src) + * outshape[0] = (src.shape[0] + 1) / 2 + */ + __pyx_v_outdim = ((PyArrayObject *)__pyx_v_src)->nd; + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1252 + * + * cdef int outdim = src.ndim + * cdef np.npy_intp* outshape = clone_array_shape(src) # <<<<<<<<<<<<<< + * outshape[0] = (src.shape[0] + 1) / 2 + * outshape[1] = (src.shape[1] + 1) / 2 + */ + __pyx_v_outshape = __pyx_f_7scikits_5image_6opencv_14opencv_backend_clone_array_shape(((PyArrayObject *)__pyx_v_src)); + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1253 + * cdef int outdim = src.ndim + * cdef np.npy_intp* outshape = clone_array_shape(src) + * outshape[0] = (src.shape[0] + 1) / 2 # <<<<<<<<<<<<<< + * outshape[1] = (src.shape[1] + 1) / 2 + * + */ + (__pyx_v_outshape[0]) = (((npy_intp)((((PyArrayObject *)__pyx_v_src)->dimensions[0]) + 1)) / 2); + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1254 + * cdef np.npy_intp* outshape = clone_array_shape(src) + * outshape[0] = (src.shape[0] + 1) / 2 + * outshape[1] = (src.shape[1] + 1) / 2 # <<<<<<<<<<<<<< + * + * cdef np.ndarray out = new_array(outdim, outshape, src.dtype) + */ + (__pyx_v_outshape[1]) = (((npy_intp)((((PyArrayObject *)__pyx_v_src)->dimensions[1]) + 1)) / 2); + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1256 + * outshape[1] = (src.shape[1] + 1) / 2 + * + * cdef np.ndarray out = new_array(outdim, outshape, src.dtype) # <<<<<<<<<<<<<< + * + * cdef IplImage srcimg + */ + __pyx_t_2 = PyObject_GetAttr(__pyx_v_src, __pyx_kp_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(__pyx_v_outdim, __pyx_v_outshape, __pyx_t_2)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_v_out = ((PyArrayObject *)__pyx_t_3); + __pyx_t_3 = 0; + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1260 + * cdef IplImage srcimg + * cdef IplImage outimg + * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< + * populate_iplimage(out, &outimg) + * + */ + __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(((PyArrayObject *)__pyx_v_src), (&__pyx_v_srcimg)); + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1261 + * cdef IplImage outimg + * populate_iplimage(src, &srcimg) + * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< + * + * c_cvPyrDown(&srcimg, &outimg, 7) + */ + __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":1263 + * populate_iplimage(out, &outimg) + * + * c_cvPyrDown(&srcimg, &outimg, 7) # <<<<<<<<<<<<<< + * + * PyMem_Free(outshape) + */ + __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvPyrDown((&__pyx_v_srcimg), (&__pyx_v_outimg), 7); + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1265 + * c_cvPyrDown(&srcimg, &outimg, 7) + * + * PyMem_Free(outshape) # <<<<<<<<<<<<<< + * + * return out + */ + PyMem_Free(__pyx_v_outshape); + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1267 + * PyMem_Free(outshape) + * + * return out # <<<<<<<<<<<<<< + * + * def cvPyrUp(np.ndarray src): + */ + __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_3); + __Pyx_XDECREF(__pyx_4); + __Pyx_XDECREF(__pyx_t_2); + __Pyx_XDECREF(__pyx_t_3); + __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvPyrDown"); + __pyx_r = NULL; + __pyx_L0:; + __Pyx_XDECREF((PyObject *)__pyx_v_out); + __Pyx_XGIVEREF(__pyx_r); + __Pyx_FinishRefcountContext(); + return __pyx_r; +} + +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1269 + * return out + * + * def cvPyrUp(np.ndarray src): # <<<<<<<<<<<<<< + * + * validate_array(src) + */ + +static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPyrUp(PyObject *__pyx_self, PyObject *__pyx_v_src); /*proto*/ +static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPyrUp(PyObject *__pyx_self, PyObject *__pyx_v_src) { + int __pyx_v_outdim; + npy_intp *__pyx_v_outshape; + PyArrayObject *__pyx_v_out = 0; + __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_srcimg; + __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_outimg; + PyObject *__pyx_r = NULL; + PyObject *__pyx_1 = 0; + PyObject *__pyx_2 = 0; + PyObject *__pyx_3 = 0; + PyObject *__pyx_4 = 0; + int __pyx_t_1; + PyObject *__pyx_t_2 = NULL; + PyObject *__pyx_t_3 = NULL; + __Pyx_SetupRefcountContext("cvPyrUp"); + __pyx_self = __pyx_self; + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1269; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1271 + * def cvPyrUp(np.ndarray src): + * + * validate_array(src) # <<<<<<<<<<<<<< + * assert_dtype(src, [UINT8, UINT16, FLOAT32, FLOAT64]) + * + */ + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(((PyArrayObject *)__pyx_v_src)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1271; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1272 + * + * validate_array(src) + * assert_dtype(src, [UINT8, UINT16, FLOAT32, FLOAT64]) # <<<<<<<<<<<<<< + * + * cdef int outdim = src.ndim + */ + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1272; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_1); + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1272; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_2); + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1272; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_3); + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_169); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1272; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_4); + __pyx_t_2 = PyList_New(4); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1272; __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); + PyList_SET_ITEM(__pyx_t_2, 1, __pyx_2); + __Pyx_GIVEREF(__pyx_2); + PyList_SET_ITEM(__pyx_t_2, 2, __pyx_3); + __Pyx_GIVEREF(__pyx_3); + PyList_SET_ITEM(__pyx_t_2, 3, __pyx_4); + __Pyx_GIVEREF(__pyx_4); + __pyx_1 = 0; + __pyx_2 = 0; + __pyx_3 = 0; + __pyx_4 = 0; + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(((PyArrayObject *)__pyx_v_src), ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1272; __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":1274 + * assert_dtype(src, [UINT8, UINT16, FLOAT32, FLOAT64]) + * + * cdef int outdim = src.ndim # <<<<<<<<<<<<<< + * cdef np.npy_intp* outshape = clone_array_shape(src) + * outshape[0] = (src.shape[0] * 2) + */ + __pyx_v_outdim = ((PyArrayObject *)__pyx_v_src)->nd; + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1275 + * + * cdef int outdim = src.ndim + * cdef np.npy_intp* outshape = clone_array_shape(src) # <<<<<<<<<<<<<< + * outshape[0] = (src.shape[0] * 2) + * outshape[1] = (src.shape[1] * 2) + */ + __pyx_v_outshape = __pyx_f_7scikits_5image_6opencv_14opencv_backend_clone_array_shape(((PyArrayObject *)__pyx_v_src)); + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1276 + * cdef int outdim = src.ndim + * cdef np.npy_intp* outshape = clone_array_shape(src) + * outshape[0] = (src.shape[0] * 2) # <<<<<<<<<<<<<< + * outshape[1] = (src.shape[1] * 2) + * + */ + (__pyx_v_outshape[0]) = ((npy_intp)((((PyArrayObject *)__pyx_v_src)->dimensions[0]) * 2)); + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1277 + * cdef np.npy_intp* outshape = clone_array_shape(src) + * outshape[0] = (src.shape[0] * 2) + * outshape[1] = (src.shape[1] * 2) # <<<<<<<<<<<<<< + * + * cdef np.ndarray out = new_array(outdim, outshape, src.dtype) + */ + (__pyx_v_outshape[1]) = ((npy_intp)((((PyArrayObject *)__pyx_v_src)->dimensions[1]) * 2)); + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1279 + * outshape[1] = (src.shape[1] * 2) + * + * cdef np.ndarray out = new_array(outdim, outshape, src.dtype) # <<<<<<<<<<<<<< + * + * cdef IplImage srcimg + */ + __pyx_t_2 = PyObject_GetAttr(__pyx_v_src, __pyx_kp_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1279; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(__pyx_v_outdim, __pyx_v_outshape, __pyx_t_2)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1279; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_v_out = ((PyArrayObject *)__pyx_t_3); + __pyx_t_3 = 0; + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1283 + * cdef IplImage srcimg + * cdef IplImage outimg + * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< + * populate_iplimage(out, &outimg) + * + */ + __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(((PyArrayObject *)__pyx_v_src), (&__pyx_v_srcimg)); + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1284 + * cdef IplImage outimg + * populate_iplimage(src, &srcimg) + * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< + * + * c_cvPyrUp(&srcimg, &outimg, 7) + */ + __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":1286 + * populate_iplimage(out, &outimg) + * + * c_cvPyrUp(&srcimg, &outimg, 7) # <<<<<<<<<<<<<< + * + * PyMem_Free(outshape) + */ + __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvPyrUp((&__pyx_v_srcimg), (&__pyx_v_outimg), 7); + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1288 + * c_cvPyrUp(&srcimg, &outimg, 7) + * + * PyMem_Free(outshape) # <<<<<<<<<<<<<< + * + * return out + */ + PyMem_Free(__pyx_v_outshape); + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1290 + * PyMem_Free(outshape) + * + * return out # <<<<<<<<<<<<<< + * + * def cvCalibrateCamera2(np.ndarray object_points, np.ndarray image_points, + */ + __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_3); + __Pyx_XDECREF(__pyx_4); + __Pyx_XDECREF(__pyx_t_2); + __Pyx_XDECREF(__pyx_t_3); + __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvPyrUp"); + __pyx_r = NULL; + __pyx_L0:; + __Pyx_XDECREF((PyObject *)__pyx_v_out); + __Pyx_XGIVEREF(__pyx_r); + __Pyx_FinishRefcountContext(); + return __pyx_r; +} + +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1292 * return out * * def cvCalibrateCamera2(np.ndarray object_points, np.ndarray image_points, # <<<<<<<<<<<<<< @@ -10120,23 +10500,23 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_image_points); if (likely(values[1])) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("cvCalibrateCamera2", 1, 4, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1236; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvCalibrateCamera2", 1, 4, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 2: values[2] = PyDict_GetItem(__pyx_kwds, __pyx_kp_point_counts); if (likely(values[2])) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("cvCalibrateCamera2", 1, 4, 4, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1236; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvCalibrateCamera2", 1, 4, 4, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 3: values[3] = PyDict_GetItem(__pyx_kwds, __pyx_kp_image_size); if (likely(values[3])) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("cvCalibrateCamera2", 1, 4, 4, 3); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1236; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvCalibrateCamera2", 1, 4, 4, 3); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; __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), "cvCalibrateCamera2") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1236; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvCalibrateCamera2") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_object_points = ((PyArrayObject *)values[0]); __pyx_v_image_points = ((PyArrayObject *)values[1]); @@ -10152,96 +10532,96 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("cvCalibrateCamera2", 1, 4, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1236; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvCalibrateCamera2", 1, 4, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; __pyx_clineno = __LINE__; goto __pyx_L3_error;} __pyx_L3_error:; __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvCalibrateCamera2"); return NULL; __pyx_L4_argument_unpacking_done:; - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_object_points), __pyx_ptype_5numpy_ndarray, 1, "object_points", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1236; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_image_points), __pyx_ptype_5numpy_ndarray, 1, "image_points", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1236; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_point_counts), __pyx_ptype_5numpy_ndarray, 1, "point_counts", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1237; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_object_points), __pyx_ptype_5numpy_ndarray, 1, "object_points", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_image_points), __pyx_ptype_5numpy_ndarray, 1, "image_points", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_point_counts), __pyx_ptype_5numpy_ndarray, 1, "point_counts", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1293; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1240 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1296 * * # Validate input * validate_array(object_points) # <<<<<<<<<<<<<< * assert_ndims(object_points, [2]) * */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_object_points); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1240; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_object_points); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1296; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1241 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1297 * # Validate input * validate_array(object_points) * assert_ndims(object_points, [2]) # <<<<<<<<<<<<<< * * validate_array(image_points) */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1241; __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 = 1297; __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_object_points, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1241; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(__pyx_v_object_points, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1297; __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":1243 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1299 * assert_ndims(object_points, [2]) * * validate_array(image_points) # <<<<<<<<<<<<<< * assert_ndims(image_points, [2]) * */ - __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_image_points); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1243; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_image_points); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1299; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1244 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1300 * * validate_array(image_points) * assert_ndims(image_points, [2]) # <<<<<<<<<<<<<< * * assert_dtype(point_counts, [INT32]) */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; __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 = 1300; __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_image_points, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(__pyx_v_image_points, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1300; __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":1246 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1302 * assert_ndims(image_points, [2]) * * assert_dtype(point_counts, [INT32]) # <<<<<<<<<<<<<< * assert_ndims(point_counts, [1]) * */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_170); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1246; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_170); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1302; __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 = 1246; __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 = 1302; __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_point_counts, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1246; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_point_counts, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1302; __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":1247 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1303 * * assert_dtype(point_counts, [INT32]) * assert_ndims(point_counts, [1]) # <<<<<<<<<<<<<< * * # Allocate a new intrinsics array */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1247; __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 = 1303; __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_ndims(__pyx_v_point_counts, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1247; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(__pyx_v_point_counts, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1303; __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":1251 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1307 * # Allocate a new intrinsics array * cdef np.npy_intp intrinsics_shape[2] * intrinsics_shape[0] = 3 # <<<<<<<<<<<<<< @@ -10250,7 +10630,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( */ (__pyx_v_intrinsics_shape[0]) = ((npy_intp)3); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1252 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1308 * cdef np.npy_intp intrinsics_shape[2] * intrinsics_shape[0] = 3 * intrinsics_shape[1] = 3 # <<<<<<<<<<<<<< @@ -10259,22 +10639,22 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( */ (__pyx_v_intrinsics_shape[1]) = ((npy_intp)3); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1253 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1309 * intrinsics_shape[0] = 3 * intrinsics_shape[1] = 3 * cdef np.ndarray intrinsics = new_array(2, intrinsics_shape, FLOAT64) # <<<<<<<<<<<<<< * cdef IplImage ipl_intrinsics * populate_iplimage(intrinsics, &ipl_intrinsics) */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_169); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_169); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1309; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(2, __pyx_v_intrinsics_shape, __pyx_1)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(2, __pyx_v_intrinsics_shape, __pyx_1)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1309; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_v_intrinsics = ((PyArrayObject *)__pyx_t_2); __pyx_t_2 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1255 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1311 * cdef np.ndarray intrinsics = new_array(2, intrinsics_shape, FLOAT64) * cdef IplImage ipl_intrinsics * populate_iplimage(intrinsics, &ipl_intrinsics) # <<<<<<<<<<<<<< @@ -10283,7 +10663,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_intrinsics, (&__pyx_v_ipl_intrinsics)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1256 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1312 * cdef IplImage ipl_intrinsics * populate_iplimage(intrinsics, &ipl_intrinsics) * cdef CvMat* cvmat_intrinsics = cvmat_ptr_from_iplimage(&ipl_intrinsics) # <<<<<<<<<<<<<< @@ -10292,7 +10672,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( */ __pyx_v_cvmat_intrinsics = __pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage((&__pyx_v_ipl_intrinsics)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1260 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1316 * # Allocate a new distortion array * cdef np.npy_intp distortion_shape[2] * distortion_shape[0] = 1 # <<<<<<<<<<<<<< @@ -10301,7 +10681,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( */ (__pyx_v_distortion_shape[0]) = ((npy_intp)1); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1261 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1317 * cdef np.npy_intp distortion_shape[2] * distortion_shape[0] = 1 * distortion_shape[1] = 5 # <<<<<<<<<<<<<< @@ -10310,22 +10690,22 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( */ (__pyx_v_distortion_shape[1]) = ((npy_intp)5); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1262 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1318 * distortion_shape[0] = 1 * distortion_shape[1] = 5 * cdef np.ndarray distortion = new_array(2, distortion_shape, FLOAT64) # <<<<<<<<<<<<<< * cdef IplImage ipl_distortion * populate_iplimage(distortion, &ipl_distortion) */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_169); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1262; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_169); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1318; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(2, __pyx_v_distortion_shape, __pyx_1)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1262; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(2, __pyx_v_distortion_shape, __pyx_1)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1318; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_v_distortion = ((PyArrayObject *)__pyx_t_2); __pyx_t_2 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1264 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1320 * cdef np.ndarray distortion = new_array(2, distortion_shape, FLOAT64) * cdef IplImage ipl_distortion * populate_iplimage(distortion, &ipl_distortion) # <<<<<<<<<<<<<< @@ -10334,7 +10714,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_distortion, (&__pyx_v_ipl_distortion)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1265 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1321 * cdef IplImage ipl_distortion * populate_iplimage(distortion, &ipl_distortion) * cdef CvMat* cvmat_distortion = cvmat_ptr_from_iplimage(&ipl_distortion) # <<<<<<<<<<<<<< @@ -10343,7 +10723,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( */ __pyx_v_cvmat_distortion = __pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage((&__pyx_v_ipl_distortion)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1270 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1326 * cdef IplImage ipl_object_points, ipl_image_points, ipl_point_counts * cdef CvMat* cvmat_object_points, *cvmat_image_points, *cvmat_point_counts * populate_iplimage(object_points, &ipl_object_points) # <<<<<<<<<<<<<< @@ -10352,7 +10732,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_object_points, (&__pyx_v_ipl_object_points)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1271 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1327 * cdef CvMat* cvmat_object_points, *cvmat_image_points, *cvmat_point_counts * populate_iplimage(object_points, &ipl_object_points) * populate_iplimage(image_points, &ipl_image_points) # <<<<<<<<<<<<<< @@ -10361,7 +10741,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_image_points, (&__pyx_v_ipl_image_points)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1272 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1328 * populate_iplimage(object_points, &ipl_object_points) * populate_iplimage(image_points, &ipl_image_points) * populate_iplimage(point_counts, &ipl_point_counts) # <<<<<<<<<<<<<< @@ -10370,7 +10750,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( */ __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_point_counts, (&__pyx_v_ipl_point_counts)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1274 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1330 * populate_iplimage(point_counts, &ipl_point_counts) * * cvmat_object_points = cvmat_ptr_from_iplimage(&ipl_object_points) # <<<<<<<<<<<<<< @@ -10379,7 +10759,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( */ __pyx_v_cvmat_object_points = __pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage((&__pyx_v_ipl_object_points)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1275 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1331 * * cvmat_object_points = cvmat_ptr_from_iplimage(&ipl_object_points) * cvmat_image_points = cvmat_ptr_from_iplimage(&ipl_image_points) # <<<<<<<<<<<<<< @@ -10388,7 +10768,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( */ __pyx_v_cvmat_image_points = __pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage((&__pyx_v_ipl_image_points)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1276 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1332 * cvmat_object_points = cvmat_ptr_from_iplimage(&ipl_object_points) * cvmat_image_points = cvmat_ptr_from_iplimage(&ipl_image_points) * cvmat_point_counts = cvmat_ptr_from_iplimage(&ipl_point_counts) # <<<<<<<<<<<<<< @@ -10397,33 +10777,33 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( */ __pyx_v_cvmat_point_counts = __pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage((&__pyx_v_ipl_point_counts)); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1280 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1336 * # Set image size * cdef CvSize cv_image_size * cv_image_size.height = image_size[0] # <<<<<<<<<<<<<< * cv_image_size.width = image_size[1] * */ - __pyx_1 = __Pyx_GetItemInt(__pyx_v_image_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1280; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_image_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1336; __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 = 1280; __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 = 1336; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_v_cv_image_size.height = __pyx_t_1; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1281 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1337 * cdef CvSize cv_image_size * cv_image_size.height = image_size[0] * cv_image_size.width = image_size[1] # <<<<<<<<<<<<<< * * # Call the function */ - __pyx_1 = __Pyx_GetItemInt(__pyx_v_image_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1281; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_image_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1337; __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 = 1281; __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 = 1337; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_v_cv_image_size.width = __pyx_t_1; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1286 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1342 * c_cvCalibrateCamera2(cvmat_object_points, cvmat_image_points, * cvmat_point_counts, cv_image_size, cvmat_intrinsics, * cvmat_distortion, NULL, NULL, 0) # <<<<<<<<<<<<<< @@ -10432,21 +10812,21 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( */ __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCalibrateCamera2(__pyx_v_cvmat_object_points, __pyx_v_cvmat_image_points, __pyx_v_cvmat_point_counts, __pyx_v_cv_image_size, __pyx_v_cvmat_intrinsics, __pyx_v_cvmat_distortion, NULL, NULL, 0); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1289 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1345 * * # Convert distortion back into a vector * distortion = np.PyArray_Squeeze(distortion) # <<<<<<<<<<<<<< * * PyMem_Free(cvmat_intrinsics) */ - __pyx_t_2 = PyArray_Squeeze(__pyx_v_distortion); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1289; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyArray_Squeeze(__pyx_v_distortion); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1345; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - if (!(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1289; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1345; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_v_distortion)); __pyx_v_distortion = ((PyArrayObject *)__pyx_t_2); __pyx_t_2 = 0; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1291 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1347 * distortion = np.PyArray_Squeeze(distortion) * * PyMem_Free(cvmat_intrinsics) # <<<<<<<<<<<<<< @@ -10455,7 +10835,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( */ PyMem_Free(__pyx_v_cvmat_intrinsics); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1292 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1348 * * PyMem_Free(cvmat_intrinsics) * PyMem_Free(cvmat_distortion) # <<<<<<<<<<<<<< @@ -10464,7 +10844,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( */ PyMem_Free(__pyx_v_cvmat_distortion); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1293 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1349 * PyMem_Free(cvmat_intrinsics) * PyMem_Free(cvmat_distortion) * PyMem_Free(cvmat_object_points) # <<<<<<<<<<<<<< @@ -10473,7 +10853,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( */ PyMem_Free(__pyx_v_cvmat_object_points); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1294 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1350 * PyMem_Free(cvmat_distortion) * PyMem_Free(cvmat_object_points) * PyMem_Free(cvmat_image_points) # <<<<<<<<<<<<<< @@ -10482,7 +10862,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( */ PyMem_Free(__pyx_v_cvmat_image_points); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1295 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1351 * PyMem_Free(cvmat_object_points) * PyMem_Free(cvmat_image_points) * PyMem_Free(cvmat_point_counts) # <<<<<<<<<<<<<< @@ -10491,7 +10871,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( */ PyMem_Free(__pyx_v_cvmat_point_counts); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1297 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1353 * PyMem_Free(cvmat_point_counts) * * return intrinsics, distortion # <<<<<<<<<<<<<< @@ -10499,7 +10879,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( * def cvFindChessboardCorners(np.ndarray src, pattern_size, */ __Pyx_XDECREF(__pyx_r); - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1297; __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 = 1353; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_2)); __Pyx_INCREF(((PyObject *)__pyx_v_intrinsics)); PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_v_intrinsics)); @@ -10526,7 +10906,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1299 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1355 * return intrinsics, distortion * * def cvFindChessboardCorners(np.ndarray src, pattern_size, # <<<<<<<<<<<<<< @@ -10574,7 +10954,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCor 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 = 1299; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvFindChessboardCorners", 0, 2, 3, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1355; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 2: if (kw_args > 0) { @@ -10583,12 +10963,12 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCor } } 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 = 1299; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvFindChessboardCorners") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1355; __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 = 1300; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_flags = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1356; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } else { __pyx_v_flags = __pyx_k_143; } @@ -10596,7 +10976,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCor __pyx_v_flags = __pyx_k_143; 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 = 1300; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __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 = 1356; __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)); @@ -10606,31 +10986,31 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCor } 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 = 1299; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvFindChessboardCorners", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1355; __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 = 1299; __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 = 1355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1313 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1369 * """ * * 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 = 1313; __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 = 1369; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1315 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1371 * 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 = 1315; __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 = 1371; __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); @@ -10638,50 +11018,50 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCor __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 = 1315; __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 = 1371; __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":1316 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1372 * * assert_nchannels(src, [1, 3]) * assert_dtype(src, [UINT8]) # <<<<<<<<<<<<<< * * cdef np.npy_intp outshape[2] */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1316; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1372; __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 = 1316; __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 = 1372; __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 = 1316; __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 = 1372; __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":1319 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1375 * * 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 = 1319; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1375; __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 = 1319; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __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 = 1375; __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 = 1319; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __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 = 1375; __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 = 1319; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1375; __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 = 1319; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyNumber_Multiply(__pyx_t_2, __pyx_1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1375; __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 = 1319; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __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 = 1375; __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":1320 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1376 * cdef np.npy_intp outshape[2] * outshape[0] = pattern_size[0] * pattern_size[1] * outshape[1] = 2 # <<<<<<<<<<<<<< @@ -10690,59 +11070,59 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCor */ (__pyx_v_outshape[1]) = ((npy_intp)2); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1322 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1378 * 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_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1322; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1378; __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 = 1322; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __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 = 1378; __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":1323 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1379 * * 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 = 1323; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1379; __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":1326 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1382 * * 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 = 1326; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1382; __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 = 1326; __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 = 1382; __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":1327 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1383 * 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 = 1327; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1383; __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 = 1327; __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 = 1383; __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":1330 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1386 * * cdef IplImage srcimg * populate_iplimage(src, &srcimg) # <<<<<<<<<<<<<< @@ -10751,7 +11131,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCor */ __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":1334 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1390 * cdef int ncorners_found * c_cvFindChessboardCorners(&srcimg, cvpattern_size, cvpoints, * &ncorners_found, flags) # <<<<<<<<<<<<<< @@ -10760,7 +11140,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCor */ __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":1336 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1392 * &ncorners_found, flags) * * return out[:ncorners_found] # <<<<<<<<<<<<<< @@ -10768,7 +11148,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCor * 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 = 1336; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = PySequence_GetSlice(__pyx_v_out, 0, __pyx_v_ncorners_found); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1392; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); __pyx_r = __pyx_1; __pyx_1 = 0; @@ -10789,7 +11169,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCor return __pyx_r; } -/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1338 +/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1394 * return out[:ncorners_found] * * def cvDrawChessboardCorners(np.ndarray src, pattern_size, np.ndarray corners, # <<<<<<<<<<<<<< @@ -10842,13 +11222,13 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor 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 = 1338; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvDrawChessboardCorners", 0, 3, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1394; __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 = 1338; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvDrawChessboardCorners", 0, 3, 4, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1394; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 3: if (kw_args > 0) { @@ -10857,7 +11237,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor } } 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 = 1338; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvDrawChessboardCorners") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1394; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } __pyx_v_src = ((PyArrayObject *)values[0]); __pyx_v_pattern_size = values[1]; @@ -10878,112 +11258,112 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor } 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 = 1338; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __Pyx_RaiseArgtupleInvalid("cvDrawChessboardCorners", 0, 3, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1394; __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 = 1338; __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 = 1338; __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 = 1394; __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 = 1394; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1355 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1411 * 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 = 1355; __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 = 1411; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1357 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1413 * 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 = 1357; __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 = 1413; __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 = 1357; __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 = 1413; __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":1358 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1414 * * assert_nchannels(src, [3]) * assert_dtype(src, [UINT8]) # <<<<<<<<<<<<<< * * assert_ndims(corners, [2]) */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1358; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1414; __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 = 1358; __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 = 1414; __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 = 1358; __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 = 1414; __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":1360 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1416 * 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 = 1360; __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 = 1416; __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 = 1360; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __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 = 1416; __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":1361 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1417 * * assert_ndims(corners, [2]) * assert_dtype(corners, [FLOAT32]) # <<<<<<<<<<<<<< * * cdef np.ndarray out */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1361; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1417; __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 = 1361; __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 = 1417; __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 = 1361; __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 = 1417; __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":1365 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1421 * 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 = 1365; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1421; __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":1366 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1422 * * 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 = 1366; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_copy); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1422; __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 = 1366; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __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 = 1422; __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 = 1366; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1422; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(((PyObject *)__pyx_v_out)); __pyx_v_out = ((PyArrayObject *)__pyx_t_5); __pyx_t_5 = 0; @@ -10991,7 +11371,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1368 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1424 * out = src.copy() * else: * out = src # <<<<<<<<<<<<<< @@ -11004,33 +11384,33 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor } __pyx_L6:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1371 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1427 * * 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 = 1371; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1427; __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 = 1371; __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 = 1427; __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":1372 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1428 * 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 = 1372; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1428; __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 = 1372; __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 = 1428; __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":1375 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1431 * * cdef IplImage outimg * populate_iplimage(out, &outimg) # <<<<<<<<<<<<<< @@ -11039,7 +11419,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor */ __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":1377 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1433 * populate_iplimage(out, &outimg) * * cdef CvPoint2D32f* cvcorners = array_as_cvPoint2D32f_ptr(corners) # <<<<<<<<<<<<<< @@ -11048,26 +11428,26 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor */ __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":1379 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1435 * 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 = 1379; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1435; __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 = 1379; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_2 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1435; __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 = 1379; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyNumber_Multiply(__pyx_1, __pyx_2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1435; __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 = 1379; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __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 = 1435; __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":1383 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1439 * cdef int pattern_was_found * * if corners.shape[0] == ncount: # <<<<<<<<<<<<<< @@ -11077,7 +11457,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor __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":1384 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1440 * * if corners.shape[0] == ncount: * pattern_was_found = 1 # <<<<<<<<<<<<<< @@ -11089,7 +11469,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor } /*else*/ { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1386 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1442 * pattern_was_found = 1 * else: * pattern_was_found = 0 # <<<<<<<<<<<<<< @@ -11100,7 +11480,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor } __pyx_L7:; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1389 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1445 * * c_cvDrawChessboardCorners(&outimg, cvpattern_size, cvcorners, * ncount, pattern_was_found) # <<<<<<<<<<<<<< @@ -11109,7 +11489,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor */ __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":1391 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1447 * ncount, pattern_was_found) * * return out # <<<<<<<<<<<<<< @@ -12743,6 +13123,8 @@ static struct PyMethodDef __pyx_methods[] = { {__Pyx_NAMESTR("cvCvtColor"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(0)}, {__Pyx_NAMESTR("cvThreshold"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvThreshold, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(0)}, {__Pyx_NAMESTR("cvAdaptiveThreshold"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvAdaptiveThreshold, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(0)}, + {__Pyx_NAMESTR("cvPyrDown"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPyrDown, METH_O, __Pyx_DOCSTR(0)}, + {__Pyx_NAMESTR("cvPyrUp"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPyrUp, METH_O, __Pyx_DOCSTR(0)}, {__Pyx_NAMESTR("cvCalibrateCamera2"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(0)}, {__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)}, @@ -12760,6 +13142,7 @@ char* __pyx_import_star_type_names[] = { "_IplConvKernel", "cvCannyPtr", "cvResizePtr", + "cvPyrDownPtr", "cvCvtColorPtr", "INT8_t", "cvIntegralPtr", @@ -12772,6 +13155,7 @@ char* __pyx_import_star_type_names[] = { "cvGoodFeaturesToTrackPtr", "cvCalibrateCamera2Ptr", "cvGetRectSubPixPtr", + "cvPyrUpPtr", "_inittab", "UINT8_t", "cvWarpAffinePtr", @@ -12843,7 +13227,7 @@ 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 = 258; __pyx_clineno = __LINE__; goto __pyx_L2_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 268; __pyx_clineno = __LINE__; goto __pyx_L2_error;} } else if (__Pyx_StrEq(name, "c_cvGetRectSubPix")) { PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvGetRectSubPix to scikits.image.opencv.opencv_cv.cvGetRectSubPixPtr"); @@ -12865,6 +13249,10 @@ static int __pyx_import_star_set(PyObject *o, PyObject* py_name, char *name) { PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvPreCornerDetect to scikits.image.opencv.opencv_cv.cvPreCorneDetectPtr"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L2_error;} } + else if (__Pyx_StrEq(name, "c_cvPyrDown")) { + PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvPyrDown to scikits.image.opencv.opencv_cv.cvPyrDownPtr"); + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 250; __pyx_clineno = __LINE__; goto __pyx_L2_error;} + } else if (__Pyx_StrEq(name, "c_cvGetQuadrangleSubPix")) { PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvGetQuadrangleSubPix to scikits.image.opencv.opencv_cv.cvGetQuadrangleSubPixPtr"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L2_error;} @@ -12895,15 +13283,19 @@ static int __pyx_import_star_set(PyObject *o, PyObject* py_name, char *name) { } else if (__Pyx_StrEq(name, "c_cvCalibrateCamera2")) { PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvCalibrateCamera2 to scikits.image.opencv.opencv_cv.cvCalibrateCamera2Ptr"); - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; __pyx_clineno = __LINE__; goto __pyx_L2_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 261; __pyx_clineno = __LINE__; goto __pyx_L2_error;} } else if (__Pyx_StrEq(name, "c_cvSobel")) { PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvSobel to scikits.image.opencv.opencv_cv.cvSobelPtr"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L2_error;} } + else if (__Pyx_StrEq(name, "c_cvPyrUp")) { + PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvPyrUp to scikits.image.opencv.opencv_cv.cvPyrUpPtr"); + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L2_error;} + } 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 = 265; __pyx_clineno = __LINE__; goto __pyx_L2_error;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; __pyx_clineno = __LINE__; goto __pyx_L2_error;} } else if (__Pyx_StrEq(name, "c_cvDilate")) { PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvDilate to scikits.image.opencv.opencv_cv.cvDilatePtr"); @@ -13217,6 +13609,8 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_kp_cvCvtColor, __pyx_k_cvCvtColor, sizeof(__pyx_k_cvCvtColor), 1, 1, 1}, {&__pyx_kp_cvThreshold, __pyx_k_cvThreshold, sizeof(__pyx_k_cvThreshold), 1, 1, 1}, {&__pyx_kp_cvAdaptiveThreshold, __pyx_k_cvAdaptiveThreshold, sizeof(__pyx_k_cvAdaptiveThreshold), 1, 1, 1}, + {&__pyx_kp_cvPyrDown, __pyx_k_cvPyrDown, sizeof(__pyx_k_cvPyrDown), 1, 1, 1}, + {&__pyx_kp_cvPyrUp, __pyx_k_cvPyrUp, sizeof(__pyx_k_cvPyrUp), 1, 1, 1}, {&__pyx_kp_117, __pyx_k_117, sizeof(__pyx_k_117), 1, 1, 1}, {&__pyx_kp_118, __pyx_k_118, sizeof(__pyx_k_118), 1, 1, 1}, {&__pyx_kp_119, __pyx_k_119, sizeof(__pyx_k_119), 1, 1, 1}, @@ -13288,10 +13682,10 @@ 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 = 286; __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 = 759; __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 = 947; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_builtin_KeyError = __Pyx_GetName(__pyx_b, __pyx_kp_KeyError); if (!__pyx_builtin_KeyError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1141; __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 = 296; __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 = 769; __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 = 957; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_builtin_KeyError = __Pyx_GetName(__pyx_b, __pyx_kp_KeyError); if (!__pyx_builtin_KeyError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1151; __pyx_clineno = __LINE__; goto __pyx_L1_error;} return 0; __pyx_L1_error:; return -1; @@ -13386,28 +13780,28 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) __pyx_ptype_5numpy_broadcast = __Pyx_ImportType("numpy", "broadcast", sizeof(PyArrayMultiIterObject)); if (unlikely(!__pyx_ptype_5numpy_broadcast)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_ptype_5numpy_ndarray = __Pyx_ImportType("numpy", "ndarray", sizeof(PyArrayObject)); if (unlikely(!__pyx_ptype_5numpy_ndarray)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /*--- Function import code ---*/ - __pyx_3 = __Pyx_ImportModule("scikits.image.opencv.opencv_backend"); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (__Pyx_ImportFunction(__pyx_3, "populate_iplimage", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage, "void (PyArrayObject *, __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (__Pyx_ImportFunction(__pyx_3, "cvmat_ptr_from_iplimage", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage, "struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *(__pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (__Pyx_ImportFunction(__pyx_3, "validate_array", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array, "int (PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (__Pyx_ImportFunction(__pyx_3, "assert_dtype", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype, "int (PyArrayObject *, PyObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (__Pyx_ImportFunction(__pyx_3, "assert_ndims", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims, "int (PyArrayObject *, PyObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (__Pyx_ImportFunction(__pyx_3, "assert_nchannels", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels, "int (PyArrayObject *, PyObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (__Pyx_ImportFunction(__pyx_3, "assert_same_dtype", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_dtype, "int (PyArrayObject *, PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (__Pyx_ImportFunction(__pyx_3, "assert_same_shape", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape, "int (PyArrayObject *, PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (__Pyx_ImportFunction(__pyx_3, "assert_same_width_and_height", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_width_and_height, "int (PyArrayObject *, PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (__Pyx_ImportFunction(__pyx_3, "assert_like", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_like, "int (PyArrayObject *, PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (__Pyx_ImportFunction(__pyx_3, "assert_not_sharing_data", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_data, "int (PyArrayObject *, PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (__Pyx_ImportFunction(__pyx_3, "new_array", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array, "PyArrayObject *(int, npy_intp *, PyObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (__Pyx_ImportFunction(__pyx_3, "new_array_like", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like, "PyArrayObject *(PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (__Pyx_ImportFunction(__pyx_3, "new_array_like_diff_dtype", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype, "PyArrayObject *(PyArrayObject *, PyObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (__Pyx_ImportFunction(__pyx_3, "get_array_nbytes", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_get_array_nbytes, "npy_intp (PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (__Pyx_ImportFunction(__pyx_3, "clone_array_shape", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_clone_array_shape, "npy_intp *(PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (__Pyx_ImportFunction(__pyx_3, "array_as_cvPoint2D32f_ptr", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_array_as_cvPoint2D32f_ptr, "struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *(PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (__Pyx_ImportFunction(__pyx_3, "get_cvTermCriteria", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_get_cvTermCriteria, "struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria (int, double)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (__Pyx_ImportFunction(__pyx_3, "get_IplConvKernel_ptr_from_array", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_get_IplConvKernel_ptr_from_array, "__pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *(PyArrayObject *, PyObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (__Pyx_ImportFunction(__pyx_3, "free_IplConvKernel", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_free_IplConvKernel, "void (__pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - Py_DECREF(__pyx_3); __pyx_3 = 0; + __pyx_2 = __Pyx_ImportModule("scikits.image.opencv.opencv_backend"); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__Pyx_ImportFunction(__pyx_2, "populate_iplimage", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage, "void (PyArrayObject *, __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__Pyx_ImportFunction(__pyx_2, "cvmat_ptr_from_iplimage", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage, "struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *(__pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__Pyx_ImportFunction(__pyx_2, "validate_array", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array, "int (PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__Pyx_ImportFunction(__pyx_2, "assert_dtype", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype, "int (PyArrayObject *, PyObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__Pyx_ImportFunction(__pyx_2, "assert_ndims", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims, "int (PyArrayObject *, PyObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__Pyx_ImportFunction(__pyx_2, "assert_nchannels", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels, "int (PyArrayObject *, PyObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__Pyx_ImportFunction(__pyx_2, "assert_same_dtype", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_dtype, "int (PyArrayObject *, PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__Pyx_ImportFunction(__pyx_2, "assert_same_shape", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape, "int (PyArrayObject *, PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__Pyx_ImportFunction(__pyx_2, "assert_same_width_and_height", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_width_and_height, "int (PyArrayObject *, PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__Pyx_ImportFunction(__pyx_2, "assert_like", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_like, "int (PyArrayObject *, PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__Pyx_ImportFunction(__pyx_2, "assert_not_sharing_data", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_data, "int (PyArrayObject *, PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__Pyx_ImportFunction(__pyx_2, "new_array", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array, "PyArrayObject *(int, npy_intp *, PyObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__Pyx_ImportFunction(__pyx_2, "new_array_like", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like, "PyArrayObject *(PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__Pyx_ImportFunction(__pyx_2, "new_array_like_diff_dtype", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype, "PyArrayObject *(PyArrayObject *, PyObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__Pyx_ImportFunction(__pyx_2, "get_array_nbytes", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_get_array_nbytes, "npy_intp (PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__Pyx_ImportFunction(__pyx_2, "clone_array_shape", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_clone_array_shape, "npy_intp *(PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__Pyx_ImportFunction(__pyx_2, "array_as_cvPoint2D32f_ptr", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_array_as_cvPoint2D32f_ptr, "struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *(PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__Pyx_ImportFunction(__pyx_2, "get_cvTermCriteria", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_get_cvTermCriteria, "struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria (int, double)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__Pyx_ImportFunction(__pyx_2, "get_IplConvKernel_ptr_from_array", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_get_IplConvKernel_ptr_from_array, "__pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *(PyArrayObject *, PyObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__Pyx_ImportFunction(__pyx_2, "free_IplConvKernel", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_free_IplConvKernel, "void (__pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + Py_DECREF(__pyx_2); __pyx_2 = 0; /*--- Execution code ---*/ /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1 @@ -16824,7 +17218,7 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) * c_cvAdaptiveThreshold = ( * ctypes.addressof(cv.cvAdaptiveThreshold))[0] # <<<<<<<<<<<<<< * - * # cvCalibrateCamera2 + * # cvPyrDown */ __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 246; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_3); @@ -16849,428 +17243,488 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvAdaptiveThreshold = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvAdaptiveThresholdPtr *)((size_t)__pyx_t_4))[0]); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":253 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":251 + * ctypedef void (*cvPyrDownPtr)(IplImage*, IplImage*, int) + * cdef cvPyrDownPtr c_cvPyrDown + * c_cvPyrDown = (ctypes.addressof(cv.cvPyrDown))[0] # <<<<<<<<<<<<<< + * + * # cvPyrUp + */ + __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_5); + __pyx_t_1 = PyObject_GetAttr(__pyx_5, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_1); + __Pyx_DECREF(__pyx_5); __pyx_5 = 0; + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_1); + __pyx_t_2 = PyObject_GetAttr(__pyx_1, __pyx_kp_cvPyrDown); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); + __Pyx_DECREF(__pyx_1); __pyx_1 = 0; + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; __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 = 251; __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 = 251; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvPyrDown = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvPyrDownPtr *)((size_t)__pyx_t_4))[0]); + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":256 + * ctypedef void (*cvPyrUpPtr)(IplImage*, IplImage*, int) + * cdef cvPyrUpPtr c_cvPyrUp + * c_cvPyrUp = (ctypes.addressof(cv.cvPyrUp))[0] # <<<<<<<<<<<<<< + * + * # cvCalibrateCamera2 + */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_2); + __pyx_t_2 = PyObject_GetAttr(__pyx_2, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); + __Pyx_DECREF(__pyx_2); __pyx_2 = 0; + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_3); + __pyx_t_3 = PyObject_GetAttr(__pyx_3, __pyx_kp_cvPyrUp); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __Pyx_DECREF(__pyx_3); __pyx_3 = 0; + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; __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 = 256; __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 = 256; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvPyrUp = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvPyrUpPtr *)((size_t)__pyx_t_4))[0]); + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":263 * cdef cvCalibrateCamera2Ptr c_cvCalibrateCamera2 * c_cvCalibrateCamera2 = ( * ctypes.addressof(cv.cvCalibrateCamera2))[0] # <<<<<<<<<<<<<< * * # cvFindChessboardCorners */ - __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_4); + __pyx_t_3 = PyObject_GetAttr(__pyx_4, __pyx_kp_addressof); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __Pyx_DECREF(__pyx_4); __pyx_4 = 0; + __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_5); - __pyx_t_1 = PyObject_GetAttr(__pyx_5, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_GetAttr(__pyx_5, __pyx_kp_117); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_1); - __pyx_t_2 = PyObject_GetAttr(__pyx_1, __pyx_kp_117); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __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 = 253; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_2)); + PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1); + __Pyx_GIVEREF(__pyx_t_1); + __pyx_t_1 = 0; + __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_1); + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __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 = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __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 = 253; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCalibrateCamera2 = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2Ptr *)((size_t)__pyx_t_4))[0]); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":260 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":270 * cdef cvFindChessboardCornersPtr c_cvFindChessboardCorners * c_cvFindChessboardCorners = ( * ctypes.addressof(cv.cvFindChessboardCorners))[0] # <<<<<<<<<<<<<< * * # cvDrawChessboardCorners */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; __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 = 270; __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 = 270; __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 = 270; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_t_2 = PyObject_GetAttr(__pyx_2, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_GetAttr(__pyx_2, __pyx_kp_118); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 270; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_3); - __pyx_t_3 = PyObject_GetAttr(__pyx_3, __pyx_kp_118); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; __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 = 260; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 270; __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 = 270; __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 = 270; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __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 = 260; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvFindChessboardCorners = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCornersPtr *)((size_t)__pyx_t_4))[0]); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":267 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":277 * cdef cvDrawChessboardCornersPtr c_cvDrawChessboardCorners * c_cvDrawChessboardCorners = ( * ctypes.addressof(cv.cvDrawChessboardCorners))[0] # <<<<<<<<<<<<<< * * #################################### */ - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 267; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 277; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_3); + __pyx_t_2 = PyObject_GetAttr(__pyx_3, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 277; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); + __Pyx_DECREF(__pyx_3); __pyx_3 = 0; + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 277; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_4); - __pyx_t_3 = PyObject_GetAttr(__pyx_4, __pyx_kp_addressof); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 267; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_GetAttr(__pyx_4, __pyx_kp_119); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 277; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 267; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_5); - __pyx_t_1 = PyObject_GetAttr(__pyx_5, __pyx_kp_119); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 267; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 267; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(((PyObject *)__pyx_t_2)); - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1); - __Pyx_GIVEREF(__pyx_t_1); - __pyx_t_1 = 0; - __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 267; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 277; __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 = 277; __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 = 277; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __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 = 267; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvDrawChessboardCorners = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCornersPtr *)((size_t)__pyx_t_4))[0]); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":513 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":523 * * def cvFindCornerSubPix(np.ndarray src, np.ndarray corners, int count, win, * zero_zone=(-1, -1), int iterations=0, # <<<<<<<<<<<<<< * double epsilon=1e-5): * */ - __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 513; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(((PyObject *)__pyx_t_1)); + __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 523; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); __Pyx_INCREF(__pyx_int_neg_1); - PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_int_neg_1); + PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_int_neg_1); __Pyx_GIVEREF(__pyx_int_neg_1); __Pyx_INCREF(__pyx_int_neg_1); - PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_int_neg_1); + PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_int_neg_1); __Pyx_GIVEREF(__pyx_int_neg_1); - __pyx_k_120 = ((PyObject *)__pyx_t_1); - __pyx_t_1 = 0; + __pyx_k_120 = ((PyObject *)__pyx_t_3); + __pyx_t_3 = 0; __Pyx_GIVEREF(__pyx_k_120); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":650 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":660 * return out * * def cvGetQuadrangleSubPix(np.ndarray src, np.ndarray warpmat, float_out=False): # <<<<<<<<<<<<<< * ''' Retrieves the pixel quandrangle from an image with * sub-pixel accuracy. In english: apply and affine transform to an image. */ - __pyx_t_1 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 650; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_k_121 = __pyx_t_1; - __pyx_t_1 = 0; + __pyx_t_3 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 660; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __pyx_k_121 = __pyx_t_3; + __pyx_t_3 = 0; __Pyx_GIVEREF(__pyx_k_121); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":699 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":709 * * 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 = 699; __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 = 699; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_1); __pyx_1 = 0; + __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_INTER_LINEAR); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 709; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_5); + __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_5); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 709; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_5); __pyx_5 = 0; __pyx_k_122 = __pyx_t_5; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":730 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":740 * * def cvWarpAffine(np.ndarray src, np.ndarray warpmat, * int flags=CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS, # <<<<<<<<<<<<<< * fillval=(0., 0., 0., 0.)): * */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_INTER_LINEAR); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 730; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_INTER_LINEAR); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_1); + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_123); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_2); - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_123); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 730; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_3); - __pyx_t_1 = PyNumber_Add(__pyx_2, __pyx_3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 730; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); + __pyx_t_3 = PyNumber_Add(__pyx_1, __pyx_2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __Pyx_DECREF(__pyx_2); __pyx_2 = 0; - __Pyx_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_t_1); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 730; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_t_3); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_k_124 = __pyx_t_5; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":731 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":741 * def cvWarpAffine(np.ndarray src, np.ndarray warpmat, * int flags=CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS, * fillval=(0., 0., 0., 0.)): # <<<<<<<<<<<<<< * * ''' Applies an affine transformation to an image. */ - __pyx_t_1 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 741; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_3); - __pyx_t_6 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 741; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_1); + __pyx_t_2 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 741; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_6 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 741; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_6); - __pyx_t_7 = PyTuple_New(4); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyTuple_New(4); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 741; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(((PyObject *)__pyx_t_7)); - PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_1); - __Pyx_GIVEREF(__pyx_t_1); - PyTuple_SET_ITEM(__pyx_t_7, 1, __pyx_t_2); - __Pyx_GIVEREF(__pyx_t_2); - PyTuple_SET_ITEM(__pyx_t_7, 2, __pyx_t_3); + PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_3); __Pyx_GIVEREF(__pyx_t_3); + PyTuple_SET_ITEM(__pyx_t_7, 1, __pyx_t_1); + __Pyx_GIVEREF(__pyx_t_1); + PyTuple_SET_ITEM(__pyx_t_7, 2, __pyx_t_2); + __Pyx_GIVEREF(__pyx_t_2); PyTuple_SET_ITEM(__pyx_t_7, 3, __pyx_t_6); __Pyx_GIVEREF(__pyx_t_6); + __pyx_t_3 = 0; __pyx_t_1 = 0; __pyx_t_2 = 0; - __pyx_t_3 = 0; __pyx_t_6 = 0; __pyx_k_125 = ((PyObject *)__pyx_t_7); __pyx_t_7 = 0; __Pyx_GIVEREF(__pyx_k_125); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":779 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":789 * * def cvWarpPerspective(np.ndarray src, np.ndarray warpmat, * int flags=CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS, # <<<<<<<<<<<<<< * fillval=(0., 0., 0., 0.)): * */ - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_INTER_LINEAR); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_INTER_LINEAR); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 789; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_3); + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_123); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 789; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_4); - __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_123); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_5); - __pyx_t_7 = PyNumber_Add(__pyx_4, __pyx_5); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyNumber_Add(__pyx_3, __pyx_4); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 789; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_7); + __Pyx_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_DECREF(__pyx_4); __pyx_4 = 0; - __Pyx_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_t_7); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_t_7); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 789; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; __pyx_k_126 = __pyx_t_5; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":780 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":790 * def cvWarpPerspective(np.ndarray src, np.ndarray warpmat, * int flags=CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS, * fillval=(0., 0., 0., 0.)): # <<<<<<<<<<<<<< * * ''' Applies a perspective transformation to an image. */ - __pyx_t_7 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 780; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 790; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_7); - __pyx_t_6 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 780; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 790; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_6); - __pyx_t_3 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 780; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_3); - __pyx_t_2 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 780; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 790; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_t_2); - __pyx_t_1 = PyTuple_New(4); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 780; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(((PyObject *)__pyx_t_1)); - PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_7); + __pyx_t_1 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 790; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_1); + __pyx_t_3 = PyTuple_New(4); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 790; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(((PyObject *)__pyx_t_3)); + PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_7); __Pyx_GIVEREF(__pyx_t_7); - PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_t_6); + PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_6); __Pyx_GIVEREF(__pyx_t_6); - PyTuple_SET_ITEM(__pyx_t_1, 2, __pyx_t_3); - __Pyx_GIVEREF(__pyx_t_3); - PyTuple_SET_ITEM(__pyx_t_1, 3, __pyx_t_2); + PyTuple_SET_ITEM(__pyx_t_3, 2, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); + PyTuple_SET_ITEM(__pyx_t_3, 3, __pyx_t_1); + __Pyx_GIVEREF(__pyx_t_1); __pyx_t_7 = 0; __pyx_t_6 = 0; - __pyx_t_3 = 0; __pyx_t_2 = 0; - __pyx_k_127 = ((PyObject *)__pyx_t_1); __pyx_t_1 = 0; + __pyx_k_127 = ((PyObject *)__pyx_t_3); + __pyx_t_3 = 0; __Pyx_GIVEREF(__pyx_k_127); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":827 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":837 * * def cvLogPolar(np.ndarray src, center, double M, * int flags=CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS): # <<<<<<<<<<<<<< * * validate_array(src) */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_INTER_LINEAR); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_INTER_LINEAR); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 837; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_5); + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_123); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 837; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __Pyx_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_123); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_2); - __pyx_t_1 = PyNumber_Add(__pyx_1, __pyx_2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); + __pyx_t_3 = PyNumber_Add(__pyx_5, __pyx_1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 837; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __Pyx_DECREF(__pyx_5); __pyx_5 = 0; __Pyx_DECREF(__pyx_1); __pyx_1 = 0; - __Pyx_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_t_1); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_t_3); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 837; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_k_128 = __pyx_t_5; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":847 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":857 * * def cvErode(np.ndarray src, np.ndarray element=None, int iterations=1, * anchor=None, in_place=False): # <<<<<<<<<<<<<< * * validate_array(src) */ - __pyx_t_1 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 847; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_k_129 = __pyx_t_1; - __pyx_t_1 = 0; + __pyx_t_3 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 857; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __pyx_k_129 = __pyx_t_3; + __pyx_t_3 = 0; __Pyx_GIVEREF(__pyx_k_129); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":879 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":889 * * def cvDilate(np.ndarray src, np.ndarray element=None, int iterations=1, * anchor=None, in_place=False): # <<<<<<<<<<<<<< * * validate_array(src) */ - __pyx_t_1 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 879; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_k_130 = __pyx_t_1; - __pyx_t_1 = 0; + __pyx_t_3 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 889; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __pyx_k_130 = __pyx_t_3; + __pyx_t_3 = 0; __Pyx_GIVEREF(__pyx_k_130); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":911 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":921 * * def cvMorphologyEx(np.ndarray src, np.ndarray element, int operation, * int iterations=1, anchor=None, in_place=False): # <<<<<<<<<<<<<< * * validate_array(src) */ - __pyx_t_1 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_k_131 = __pyx_t_1; - __pyx_t_1 = 0; + __pyx_t_3 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 921; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __pyx_k_131 = __pyx_t_3; + __pyx_t_3 = 0; __Pyx_GIVEREF(__pyx_k_131); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":960 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":970 * * 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_3 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_GAUSSIAN); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 960; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_3); - __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_3); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 960; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_3); __pyx_3 = 0; + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_GAUSSIAN); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 970; __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 = 970; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_2); __pyx_2 = 0; __pyx_k_132 = __pyx_t_5; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":962 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":972 * 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_1 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 962; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - if (!(likely(PyBool_Check(__pyx_t_1)) || (__pyx_t_1) == Py_None || (PyErr_Format(PyExc_TypeError, "Expected bool, got %s", Py_TYPE(__pyx_t_1)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 962; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_k_133 = ((PyObject *)__pyx_t_1); + __pyx_t_3 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + if (!(likely(PyBool_Check(__pyx_t_3)) || (__pyx_t_3) == Py_None || (PyErr_Format(PyExc_TypeError, "Expected bool, got %s", Py_TYPE(__pyx_t_3)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_k_133 = ((PyObject *)__pyx_t_3); __Pyx_GIVEREF(__pyx_k_133); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1034 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1044 * return out * * def cvFilter2D(np.ndarray src, np.ndarray kernel, anchor=None, in_place=False): # <<<<<<<<<<<<<< * * validate_array(src) */ - __pyx_t_1 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1034; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_k_134 = __pyx_t_1; - __pyx_t_1 = 0; + __pyx_t_3 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1044; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __pyx_k_134 = __pyx_t_3; + __pyx_t_3 = 0; __Pyx_GIVEREF(__pyx_k_134); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1080 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1090 * return out * * def cvIntegral(np.ndarray src, square_sum=False, tilted_sum=False): # <<<<<<<<<<<<<< * * validate_array(src) */ - __pyx_t_1 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1080; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_k_135 = __pyx_t_1; - __pyx_t_1 = 0; + __pyx_t_3 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __pyx_k_135 = __pyx_t_3; + __pyx_t_3 = 0; __Pyx_GIVEREF(__pyx_k_135); - __pyx_t_1 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1080; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_k_136 = __pyx_t_1; - __pyx_t_1 = 0; + __pyx_t_3 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __pyx_k_136 = __pyx_t_3; + __pyx_t_3 = 0; __Pyx_GIVEREF(__pyx_k_136); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1179 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1189 * * def cvThreshold(np.ndarray src, double threshold, double max_value=255, * int threshold_type=CV_THRESH_BINARY, use_otsu=False): # <<<<<<<<<<<<<< * * validate_array(src) */ - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_THRESH_BINARY); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1179; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_4); - __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_4); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1179; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_4); __pyx_4 = 0; + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_THRESH_BINARY); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1189; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_3); + __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_3); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1189; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_3); __pyx_3 = 0; __pyx_k_137 = __pyx_t_5; - __pyx_t_1 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1179; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_k_138 = __pyx_t_1; - __pyx_t_1 = 0; + __pyx_t_3 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1189; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __pyx_k_138 = __pyx_t_3; + __pyx_t_3 = 0; __Pyx_GIVEREF(__pyx_k_138); - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1205 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1215 * * def cvAdaptiveThreshold(np.ndarray src, double max_value, * int adaptive_method=CV_ADAPTIVE_THRESH_MEAN_C, # <<<<<<<<<<<<<< * int threshold_type=CV_THRESH_BINARY, * int block_size=3, double param1=5): */ - __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_139); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1205; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_5); - __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_5); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1205; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_5); __pyx_5 = 0; + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_139); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1215; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_4); + __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_4); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1215; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_4); __pyx_4 = 0; __pyx_k_140 = __pyx_t_5; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1206 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1216 * def cvAdaptiveThreshold(np.ndarray src, double max_value, * int adaptive_method=CV_ADAPTIVE_THRESH_MEAN_C, * int threshold_type=CV_THRESH_BINARY, # <<<<<<<<<<<<<< * int block_size=3, double param1=5): * */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_THRESH_BINARY); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1206; __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 = 1206; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_1); __pyx_1 = 0; + __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_THRESH_BINARY); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1216; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_5); + __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_5); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1216; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_5); __pyx_5 = 0; __pyx_k_141 = __pyx_t_5; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1300 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1356 * * def cvFindChessboardCorners(np.ndarray src, pattern_size, * int flags = CV_CALIB_CB_ADAPTIVE_THRESH): # <<<<<<<<<<<<<< * """ * Wrapper around the OpenCV cvFindChessboardCorners function. */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_142); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1300; __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 = 1300; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(__pyx_2); __pyx_2 = 0; + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_142); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1356; __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 = 1356; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_1); __pyx_1 = 0; __pyx_k_143 = __pyx_t_5; - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1339 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1395 * * def cvDrawChessboardCorners(np.ndarray src, pattern_size, np.ndarray corners, * in_place=True): # <<<<<<<<<<<<<< * """ * Wrapper around the OpenCV cvDrawChessboardCorners function. */ - __pyx_t_1 = __Pyx_PyBool_FromLong(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1339; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_1); - __pyx_k_144 = __pyx_t_1; - __pyx_t_1 = 0; + __pyx_t_3 = __Pyx_PyBool_FromLong(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1395; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_GOTREF(__pyx_t_3); + __pyx_k_144 = __pyx_t_3; + __pyx_t_3 = 0; __Pyx_GIVEREF(__pyx_k_144); /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/python_mem.pxd":1 diff --git a/scikits/image/opencv/opencv_cv.pyx b/scikits/image/opencv/opencv_cv.pyx index 13e5d075..7a2dda99 100644 --- a/scikits/image/opencv/opencv_cv.pyx +++ b/scikits/image/opencv/opencv_cv.pyx @@ -245,6 +245,16 @@ cdef cvAdaptiveThresholdPtr c_cvAdaptiveThreshold c_cvAdaptiveThreshold = ( ctypes.addressof(cv.cvAdaptiveThreshold))[0] +# cvPyrDown +ctypedef void (*cvPyrDownPtr)(IplImage*, IplImage*, int) +cdef cvPyrDownPtr c_cvPyrDown +c_cvPyrDown = (ctypes.addressof(cv.cvPyrDown))[0] + +# cvPyrUp +ctypedef void (*cvPyrUpPtr)(IplImage*, IplImage*, int) +cdef cvPyrUpPtr c_cvPyrUp +c_cvPyrUp = (ctypes.addressof(cv.cvPyrUp))[0] + # cvCalibrateCamera2 ctypedef void (*cvCalibrateCamera2Ptr)(CvMat*, CvMat*, CvMat*, CvSize, CvMat*, CvMat*, CvMat*, CvMat*, int) @@ -1233,6 +1243,52 @@ def cvAdaptiveThreshold(np.ndarray src, double max_value, return out +def cvPyrDown(np.ndarray src): + + validate_array(src) + assert_dtype(src, [UINT8, UINT16, FLOAT32, FLOAT64]) + + cdef int outdim = src.ndim + cdef np.npy_intp* outshape = clone_array_shape(src) + outshape[0] = (src.shape[0] + 1) / 2 + outshape[1] = (src.shape[1] + 1) / 2 + + cdef np.ndarray out = new_array(outdim, outshape, src.dtype) + + cdef IplImage srcimg + cdef IplImage outimg + populate_iplimage(src, &srcimg) + populate_iplimage(out, &outimg) + + c_cvPyrDown(&srcimg, &outimg, 7) + + PyMem_Free(outshape) + + return out + +def cvPyrUp(np.ndarray src): + + validate_array(src) + assert_dtype(src, [UINT8, UINT16, FLOAT32, FLOAT64]) + + cdef int outdim = src.ndim + cdef np.npy_intp* outshape = clone_array_shape(src) + outshape[0] = (src.shape[0] * 2) + outshape[1] = (src.shape[1] * 2) + + cdef np.ndarray out = new_array(outdim, outshape, src.dtype) + + cdef IplImage srcimg + cdef IplImage outimg + populate_iplimage(src, &srcimg) + populate_iplimage(out, &outimg) + + c_cvPyrUp(&srcimg, &outimg, 7) + + PyMem_Free(outshape) + + return out + def cvCalibrateCamera2(np.ndarray object_points, np.ndarray image_points, np.ndarray point_counts, image_size): diff --git a/scikits/image/opencv/tests/test_opencv_cv.py b/scikits/image/opencv/tests/test_opencv_cv.py index fb1141c8..aee1fd5e 100644 --- a/scikits/image/opencv/tests/test_opencv_cv.py +++ b/scikits/image/opencv/tests/test_opencv_cv.py @@ -217,6 +217,18 @@ class TestAdaptiveThreshold(OpenCVTest): cvAdaptiveThreshold(self.lena_GRAY_U8, 100) +class TestPyrDown(OpenCVTest): + @opencv_skip + def test_cvPyrDown(self): + cvPyrDown(self.lena_RGB_U8) + + +class TestPyrUp(OpenCVTest): + @opencv_skip + def test_cvPyrUp(self): + cvPyrUp(self.lena_RGB_U8) + + class TestFindChessboardCorners(object): @opencv_skip def test_cvFindChessboardCorners(self):