From 331125cc1c941f76fb307c8e1e0ca6258ecbd907 Mon Sep 17 00:00:00 2001 From: sccolbert Date: Sat, 24 Oct 2009 18:05:20 +0200 Subject: [PATCH] fixed threshold to add otsu as a kwarg --- scikits/image/opencv/opencv_constants.py | 1 - scikits/image/opencv/opencv_cv.c | 434 +++++++++---------- scikits/image/opencv/opencv_cv.pyx | 4 +- scikits/image/opencv/tests/test_opencv_cv.py | 2 +- 4 files changed, 220 insertions(+), 221 deletions(-) diff --git a/scikits/image/opencv/opencv_constants.py b/scikits/image/opencv/opencv_constants.py index a539817d..76b97b24 100644 --- a/scikits/image/opencv/opencv_constants.py +++ b/scikits/image/opencv/opencv_constants.py @@ -32,7 +32,6 @@ CV_THRESH_TRUNC = 2 CV_THRESH_TOZERO = 3 CV_THRESH_TOZERO_INV = 4 CV_THRESH_MASK = 7 -CV_THRESH_OTSU = 8 # this must be combined with other flags CV_ADAPTIVE_THRESH_MEAN_C = 0 CV_ADAPTIVE_THRESH_GAUSSIAN_C = 1 diff --git a/scikits/image/opencv/opencv_cv.c b/scikits/image/opencv/opencv_cv.c index 43f33d41..7a5ce99d 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 17:48:43 2009 */ +/* Generated by Cython 0.11.3 on Sat Oct 24 18:03:23 2009 */ #define PY_SSIZE_T_CLEAN #include "Python.h" @@ -1095,10 +1095,11 @@ static PyObject *__pyx_k_134 = 0; static PyObject *__pyx_k_135 = 0; static PyObject *__pyx_k_136 = 0; static int __pyx_k_137; -static int __pyx_k_139; +static PyObject *__pyx_k_138 = 0; static int __pyx_k_140; -static int __pyx_k_142; -static PyObject *__pyx_k_143 = 0; +static int __pyx_k_141; +static int __pyx_k_143; +static PyObject *__pyx_k_144 = 0; #define __Pyx_MODULE_NAME "scikits.image.opencv.opencv_cv" int __pyx_module_is_main_scikits__image__opencv__opencv_cv = 0; @@ -1109,7 +1110,6 @@ static PyObject *__pyx_int_1; static PyObject *__pyx_int_2; static PyObject *__pyx_int_neg_1; static PyObject *__pyx_int_6; -static PyObject *__pyx_int_0; static char __pyx_k___main__[] = "__main__"; static PyObject *__pyx_kp___main__; static char __pyx_k_src[] = "src"; @@ -1204,6 +1204,8 @@ static char __pyx_k_max_value[] = "max_value"; static PyObject *__pyx_kp_max_value; static char __pyx_k_threshold_type[] = "threshold_type"; static PyObject *__pyx_kp_threshold_type; +static char __pyx_k_use_otsu[] = "use_otsu"; +static PyObject *__pyx_kp_use_otsu; static char __pyx_k_adaptive_method[] = "adaptive_method"; static PyObject *__pyx_kp_adaptive_method; static char __pyx_k_object_points[] = "object_points"; @@ -1450,18 +1452,18 @@ static char __pyx_k_CV_GAUSSIAN[] = "CV_GAUSSIAN"; static PyObject *__pyx_kp_CV_GAUSSIAN; static char __pyx_k_CV_THRESH_BINARY[] = "CV_THRESH_BINARY"; static PyObject *__pyx_kp_CV_THRESH_BINARY; -static char __pyx_k_138[] = "CV_ADAPTIVE_THRESH_MEAN_C"; -static PyObject *__pyx_kp_138; -static char __pyx_k_141[] = "CV_CALIB_CB_ADAPTIVE_THRESH"; -static PyObject *__pyx_kp_141; -static char __pyx_k_144[] = "INT8"; -static PyObject *__pyx_kp_144; +static char __pyx_k_139[] = "CV_ADAPTIVE_THRESH_MEAN_C"; +static PyObject *__pyx_kp_139; +static char __pyx_k_142[] = "CV_CALIB_CB_ADAPTIVE_THRESH"; +static PyObject *__pyx_kp_142; +static char __pyx_k_145[] = "INT8"; +static PyObject *__pyx_kp_145; static char __pyx_k_ValueError[] = "ValueError"; static PyObject *__pyx_kp_ValueError; static char __pyx_k_dtype[] = "dtype"; static PyObject *__pyx_kp_dtype; -static char __pyx_k_146[] = "INT16"; -static PyObject *__pyx_kp_146; +static char __pyx_k_147[] = "INT16"; +static PyObject *__pyx_kp_147; static char __pyx_k_reshape[] = "reshape"; static PyObject *__pyx_kp_reshape; static char __pyx_k_shape[] = "shape"; @@ -1484,30 +1486,26 @@ static char __pyx_k_CV_BLUR_NO_SCALE[] = "CV_BLUR_NO_SCALE"; static PyObject *__pyx_kp_CV_BLUR_NO_SCALE; static char __pyx_k_CV_BLUR[] = "CV_BLUR"; static PyObject *__pyx_kp_CV_BLUR; -static char __pyx_k_168[] = "FLOAT64"; -static PyObject *__pyx_kp_168; -static char __pyx_k_169[] = "INT32"; +static char __pyx_k_169[] = "FLOAT64"; static PyObject *__pyx_kp_169; +static char __pyx_k_170[] = "INT32"; +static PyObject *__pyx_kp_170; static char __pyx_k_append[] = "append"; static PyObject *__pyx_kp_append; static char __pyx_k_KeyError[] = "KeyError"; static PyObject *__pyx_kp_KeyError; -static char __pyx_k_CV_THRESH_OTSU[] = "CV_THRESH_OTSU"; -static PyObject *__pyx_kp_CV_THRESH_OTSU; -static char __pyx_k_171[] = "CV_ADAPTIVE_THRESH_GAUSSIAN_C"; -static PyObject *__pyx_kp_171; -static char __pyx_k_173[] = "CV_THRESH_BINARY_INV"; -static PyObject *__pyx_kp_173; +static char __pyx_k_172[] = "CV_ADAPTIVE_THRESH_GAUSSIAN_C"; +static PyObject *__pyx_kp_172; +static char __pyx_k_174[] = "CV_THRESH_BINARY_INV"; +static PyObject *__pyx_kp_174; static char __pyx_k_copy[] = "copy"; static PyObject *__pyx_kp_copy; static PyObject *__pyx_builtin_ValueError; static PyObject *__pyx_builtin_range; static PyObject *__pyx_builtin_RuntimeError; static PyObject *__pyx_builtin_KeyError; -static PyObject *__pyx_kp_145; -static char __pyx_k_145[] = "aperture_size must be 3, 5, or 7"; -static PyObject *__pyx_kp_147; -static char __pyx_k_147[] = "aperture_size must be 3, 5, or 7"; +static PyObject *__pyx_kp_146; +static char __pyx_k_146[] = "aperture_size must be 3, 5, or 7"; static PyObject *__pyx_kp_148; static char __pyx_k_148[] = "aperture_size must be 3, 5, or 7"; static PyObject *__pyx_kp_149; @@ -1519,43 +1517,45 @@ static char __pyx_k_151[] = "aperture_size must be 3, 5, or 7"; static PyObject *__pyx_kp_152; static char __pyx_k_152[] = "aperture_size must be 3, 5, or 7"; static PyObject *__pyx_kp_153; -static char __pyx_k_153[] = "The number of declared points is different than exists in the array."; +static char __pyx_k_153[] = "aperture_size must be 3, 5, or 7"; static PyObject *__pyx_kp_154; +static char __pyx_k_154[] = "The number of declared points is different than exists in the array."; static PyObject *__pyx_kp_155; -static char __pyx_k_154[] = "warpmat must be 2x3"; -static char __pyx_k_155[] = "warpmat must be 2x3"; static PyObject *__pyx_kp_156; -static char __pyx_k_156[] = "width and height must not be none"; +static char __pyx_k_155[] = "warpmat must be 2x3"; +static char __pyx_k_156[] = "warpmat must be 2x3"; static PyObject *__pyx_kp_157; +static char __pyx_k_157[] = "width and height must not be none"; static PyObject *__pyx_kp_158; static PyObject *__pyx_kp_159; -static char __pyx_k_157[] = "fillval must be a 4-tuple"; -static char __pyx_k_158[] = "warpmat must be 2x3"; -static char __pyx_k_159[] = "warpmat must be 2x3"; static PyObject *__pyx_kp_160; +static char __pyx_k_158[] = "fillval must be a 4-tuple"; +static char __pyx_k_159[] = "warpmat must be 2x3"; +static char __pyx_k_160[] = "warpmat must be 2x3"; static PyObject *__pyx_kp_161; static PyObject *__pyx_kp_162; -static char __pyx_k_160[] = "fillval must be a 4-tuple"; -static char __pyx_k_161[] = "warpmat must be 3x3"; -static char __pyx_k_162[] = "warpmat must be 3x3"; static PyObject *__pyx_kp_163; -static char __pyx_k_163[] = "operation type not understood"; +static char __pyx_k_161[] = "fillval must be a 4-tuple"; +static char __pyx_k_162[] = "warpmat must be 3x3"; +static char __pyx_k_163[] = "warpmat must be 3x3"; static PyObject *__pyx_kp_164; +static char __pyx_k_164[] = "operation type not understood"; static PyObject *__pyx_kp_165; -static char __pyx_k_164[] = "In place operation not supported with this filter"; -static char __pyx_k_165[] = "In place operation not supported with this filter"; static PyObject *__pyx_kp_166; +static char __pyx_k_165[] = "In place operation not supported with this filter"; +static char __pyx_k_166[] = "In place operation not supported with this filter"; static PyObject *__pyx_kp_167; -static char __pyx_k_166[] = "anchor must be (x, y) tuple"; -static char __pyx_k_167[] = "anchor point must be inside kernel"; -static PyObject *__pyx_kp_170; -static char __pyx_k_170[] = "unknown conversion code"; -static PyObject *__pyx_kp_172; -static PyObject *__pyx_kp_174; +static PyObject *__pyx_kp_168; +static char __pyx_k_167[] = "anchor must be (x, y) tuple"; +static char __pyx_k_168[] = "anchor point must be inside kernel"; +static PyObject *__pyx_kp_171; +static char __pyx_k_171[] = "unknown conversion code"; +static PyObject *__pyx_kp_173; static PyObject *__pyx_kp_175; -static char __pyx_k_172[] = "Invalid adaptive method"; -static char __pyx_k_174[] = "Invalid threshold type"; -static char __pyx_k_175[] = "block size must be and odd number and greater than 1"; +static PyObject *__pyx_kp_176; +static char __pyx_k_173[] = "Invalid adaptive method"; +static char __pyx_k_175[] = "Invalid threshold type"; +static char __pyx_k_176[] = "block size must be and odd number and greater than 1"; static PyObject *__pyx_int_15; static char __pyx_k___getbuffer__[] = "__getbuffer__"; static PyObject *__pyx_kp___getbuffer__; @@ -1736,7 +1736,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ */ __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_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_144); 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 = 282; __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_GOTREF(__pyx_3); @@ -1797,9 +1797,9 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ */ __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_GOTREF(((PyObject *)__pyx_t_2)); - __Pyx_INCREF(__pyx_kp_145); - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_145); - __Pyx_GIVEREF(__pyx_kp_145); + __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_GOTREF(__pyx_t_5); __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; @@ -1882,7 +1882,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ 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_GOTREF(__pyx_t_2); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_144); 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 = 293; __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_GOTREF(__pyx_t_5); @@ -1903,7 +1903,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ * else: * assert_dtype(out, [FLOAT32]) */ - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_146); 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 = 294; __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_GOTREF(((PyObject *)__pyx_t_5)); @@ -1958,7 +1958,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ 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_GOTREF(__pyx_t_2); - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_144); 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 = 298; __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_GOTREF(__pyx_t_5); @@ -1979,7 +1979,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_ * else: * out = new_array_like(src) */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_146); 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 = 299; __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_GOTREF(__pyx_t_5); @@ -2170,7 +2170,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject */ __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_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_144); 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 = 322; __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_GOTREF(__pyx_3); @@ -2231,9 +2231,9 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject */ __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_GOTREF(((PyObject *)__pyx_t_2)); - __Pyx_INCREF(__pyx_kp_147); - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_147); - __Pyx_GIVEREF(__pyx_kp_147); + __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_GOTREF(__pyx_t_5); __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; @@ -2316,7 +2316,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject 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_GOTREF(__pyx_t_2); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_144); 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 = 334; __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_GOTREF(__pyx_t_5); @@ -2337,7 +2337,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject * else: * assert_dtype(out, [FLOAT32]) */ - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_146); 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 = 335; __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_GOTREF(((PyObject *)__pyx_t_5)); @@ -2392,7 +2392,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject 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_GOTREF(__pyx_t_2); - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_144); 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 = 339; __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_GOTREF(__pyx_t_5); @@ -2413,7 +2413,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject * else: * out = new_array_like(src) */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_146); 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 = 340; __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_GOTREF(__pyx_t_5); @@ -2662,9 +2662,9 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_ */ __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_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_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_GOTREF(__pyx_t_5); __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; @@ -2958,9 +2958,9 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P */ __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_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_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_GOTREF(__pyx_t_5); __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; @@ -3266,9 +3266,9 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn */ __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_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_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_GOTREF(__pyx_t_5); __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; @@ -3555,9 +3555,9 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenVal */ __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_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_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_GOTREF(__pyx_t_5); __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; @@ -3817,9 +3817,9 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerHarris(PyOb */ __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_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_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_GOTREF(__pyx_t_5); __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; @@ -4147,9 +4147,9 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix( */ __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_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_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_GOTREF(__pyx_t_4); __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; @@ -5047,7 +5047,7 @@ 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_154); + PyErr_SetObject(PyExc_AssertionError, __pyx_kp_155); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 671; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } #endif @@ -5061,7 +5061,7 @@ 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_155); + PyErr_SetObject(PyExc_AssertionError, __pyx_kp_156); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 672; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } #endif @@ -5339,9 +5339,9 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject * */ __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_GOTREF(((PyObject *)__pyx_t_5)); - __Pyx_INCREF(__pyx_kp_156); - PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_kp_156); - __Pyx_GIVEREF(__pyx_kp_156); + __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_GOTREF(__pyx_t_6); __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; @@ -5606,7 +5606,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje #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;} if (unlikely(!(__pyx_t_2 == 4))) { - PyErr_SetObject(PyExc_AssertionError, __pyx_kp_157); + PyErr_SetObject(PyExc_AssertionError, __pyx_kp_158); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 748; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } #endif @@ -5653,7 +5653,7 @@ 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_158); + PyErr_SetObject(PyExc_AssertionError, __pyx_kp_159); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 751; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } #endif @@ -5667,7 +5667,7 @@ 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_159); + PyErr_SetObject(PyExc_AssertionError, __pyx_kp_160); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 752; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } #endif @@ -5919,7 +5919,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P #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;} if (unlikely(!(__pyx_t_2 == 4))) { - PyErr_SetObject(PyExc_AssertionError, __pyx_kp_160); + PyErr_SetObject(PyExc_AssertionError, __pyx_kp_161); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 797; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } #endif @@ -5966,7 +5966,7 @@ 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_161); + PyErr_SetObject(PyExc_AssertionError, __pyx_kp_162); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 800; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } #endif @@ -5980,7 +5980,7 @@ 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_162); + PyErr_SetObject(PyExc_AssertionError, __pyx_kp_163); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 801; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } #endif @@ -7270,9 +7270,9 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb */ __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_GOTREF(((PyObject *)__pyx_t_5)); - __Pyx_INCREF(__pyx_kp_163); - PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_kp_163); - __Pyx_GIVEREF(__pyx_kp_163); + __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_GOTREF(__pyx_t_4); __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0; @@ -7580,9 +7580,9 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * */ __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_GOTREF(((PyObject *)__pyx_t_4)); - __Pyx_INCREF(__pyx_kp_164); - PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_kp_164); - __Pyx_GIVEREF(__pyx_kp_164); + __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_GOTREF(__pyx_t_3); __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; @@ -7602,7 +7602,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * */ __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_GOTREF(__pyx_1); - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_144); 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 = 983; __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_GOTREF(__pyx_3); @@ -7691,7 +7691,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * * assert_same_shape(src, out) * else: */ - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_146); 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 = 990; __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_GOTREF(((PyObject *)__pyx_t_4)); @@ -7757,7 +7757,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * * * # CV_BLUR and CV_GAUSSIAN */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_146); 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 = 996; __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_GOTREF(__pyx_t_3); @@ -7815,7 +7815,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * */ __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_GOTREF(__pyx_2); - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_144); 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 = 1001; __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_GOTREF(__pyx_1); @@ -7923,7 +7923,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * */ __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_GOTREF(__pyx_2); - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_144); 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 = 1013; __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_GOTREF(((PyObject *)__pyx_t_3)); @@ -7973,9 +7973,9 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject * */ __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_GOTREF(((PyObject *)__pyx_t_3)); - __Pyx_INCREF(__pyx_kp_165); - PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_kp_165); - __Pyx_GIVEREF(__pyx_kp_165); + __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_GOTREF(__pyx_t_4); __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; @@ -8249,7 +8249,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject #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;} if (unlikely(!(__pyx_t_4 == 2))) { - PyErr_SetObject(PyExc_AssertionError, __pyx_kp_166); + PyErr_SetObject(PyExc_AssertionError, __pyx_kp_167); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1044; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } #endif @@ -8320,7 +8320,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject * else: * cv_anchor.x = (kernel.shape[1] / 2.) */ - PyErr_SetObject(PyExc_AssertionError, __pyx_kp_167); + PyErr_SetObject(PyExc_AssertionError, __pyx_kp_168); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } #endif @@ -8608,7 +8608,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject __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_GOTREF(__pyx_2); - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_168); 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 = 1083; __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_GOTREF(((PyObject *)__pyx_t_2)); @@ -8726,7 +8726,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject * else: * outsum = new_array(out_dims, out_shape, FLOAT64) */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_169); 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 = 1107; __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_GOTREF(__pyx_t_3); @@ -8745,7 +8745,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject * * populate_iplimage(outsum, &outsumimg) */ - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_168); 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 = 1109; __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_GOTREF(__pyx_t_3); @@ -8793,7 +8793,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject * populate_iplimage(outsqsum, &outsqsumimg) * out.append(outsqsum) */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_168); 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 = 1115; __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_GOTREF(__pyx_t_3); @@ -9123,7 +9123,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(PyObject * raise * */ - if (__Pyx_PrintOne(__pyx_kp_170) < 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 = 1142; __pyx_clineno = __LINE__; goto __pyx_L8_except_error;} /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1143 * except KeyError: @@ -9367,7 +9367,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(PyObject * return out * * def cvThreshold(np.ndarray src, double threshold, double max_value=255, # <<<<<<<<<<<<<< - * int threshold_type=CV_THRESH_BINARY): + * int threshold_type=CV_THRESH_BINARY, use_otsu=False): * */ @@ -9377,7 +9377,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvThreshold(PyObjec double __pyx_v_threshold; double __pyx_v_max_value; int __pyx_v_threshold_type; - PyObject *__pyx_v_use_otsu; + PyObject *__pyx_v_use_otsu = 0; 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; @@ -9386,15 +9386,17 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvThreshold(PyObjec PyObject *__pyx_2 = 0; int __pyx_t_1; PyObject *__pyx_t_2 = NULL; - PyObject *__pyx_t_3 = NULL; - int __pyx_t_4; - static PyObject **__pyx_pyargnames[] = {&__pyx_kp_src,&__pyx_kp_threshold,&__pyx_kp_max_value,&__pyx_kp_threshold_type,0}; + int __pyx_t_3; + PyObject *__pyx_t_4 = NULL; + static PyObject **__pyx_pyargnames[] = {&__pyx_kp_src,&__pyx_kp_threshold,&__pyx_kp_max_value,&__pyx_kp_threshold_type,&__pyx_kp_use_otsu,0}; __Pyx_SetupRefcountContext("cvThreshold"); __pyx_self = __pyx_self; if (unlikely(__pyx_kwds)) { Py_ssize_t kw_args = PyDict_Size(__pyx_kwds); - PyObject* values[4] = {0,0,0,0}; + PyObject* values[5] = {0,0,0,0,0}; + values[4] = __pyx_k_138; switch (PyTuple_GET_SIZE(__pyx_args)) { + case 5: values[4] = PyTuple_GET_ITEM(__pyx_args, 4); case 4: values[3] = PyTuple_GET_ITEM(__pyx_args, 3); case 3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2); case 2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1); @@ -9411,7 +9413,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, 4, 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 = 1178; __pyx_clineno = __LINE__; goto __pyx_L3_error;} } case 2: if (kw_args > 0) { @@ -9423,6 +9425,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvThreshold(PyObjec PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_threshold_type); if (unlikely(value)) { values[3] = value; kw_args--; } } + case 4: + if (kw_args > 0) { + PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_use_otsu); + if (unlikely(value)) { values[4] = value; kw_args--; } + } } 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;} @@ -9439,10 +9446,14 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvThreshold(PyObjec } else { __pyx_v_threshold_type = __pyx_k_137; } + __pyx_v_use_otsu = values[4]; } else { __pyx_v_max_value = ((double)255); __pyx_v_threshold_type = __pyx_k_137; + __pyx_v_use_otsu = __pyx_k_138; switch (PyTuple_GET_SIZE(__pyx_args)) { + 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;} case 3: @@ -9456,16 +9467,15 @@ 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, 4, 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 = 1178; __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:; - __pyx_v_use_otsu = 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 = 1178; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1181 - * int threshold_type=CV_THRESH_BINARY): + * int threshold_type=CV_THRESH_BINARY, use_otsu=False): * * validate_array(src) # <<<<<<<<<<<<<< * assert_nchannels(src, [1]) @@ -9493,7 +9503,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvThreshold(PyObjec * assert_nchannels(src, [1]) * assert_dtype(src, [UINT8, FLOAT32]) # <<<<<<<<<<<<<< * - * use_otsu = (threshold_type & CV_THRESH_OTSU) != 0 + * 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_GOTREF(__pyx_1); @@ -9513,57 +9523,44 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvThreshold(PyObjec /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1185 * assert_dtype(src, [UINT8, FLOAT32]) * - * use_otsu = (threshold_type & CV_THRESH_OTSU) != 0 # <<<<<<<<<<<<<< - * if use_otsu: - * assert_dtype(src, [UINT8]) - */ - __pyx_t_2 = PyInt_FromLong(__pyx_v_threshold_type); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1185; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_THRESH_OTSU); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1185; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_1); - __pyx_t_3 = PyNumber_And(__pyx_t_2, __pyx_1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1185; __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_2 = PyObject_RichCompare(__pyx_t_3, __pyx_int_0, Py_NE); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1185; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF(__pyx_v_use_otsu); - __pyx_v_use_otsu = __pyx_t_2; - __pyx_t_2 = 0; - - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1186 - * - * use_otsu = (threshold_type & CV_THRESH_OTSU) != 0 * if use_otsu: # <<<<<<<<<<<<<< * assert_dtype(src, [UINT8]) - * + * threshold_type += 8 */ - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_v_use_otsu); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1186; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (__pyx_t_4) { + __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;} + if (__pyx_t_3) { - /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1187 - * use_otsu = (threshold_type & CV_THRESH_OTSU) != 0 + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1186 + * * 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_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_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_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; + + /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1187 + * if use_otsu: + * assert_dtype(src, [UINT8]) + * threshold_type += 8 # <<<<<<<<<<<<<< * * cdef np.ndarray out = new_array_like(src) */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1187; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(__pyx_2); - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1187; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(((PyObject *)__pyx_t_2)); - PyList_SET_ITEM(__pyx_t_2, 0, __pyx_2); - __Pyx_GIVEREF(__pyx_2); - __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 = 1187; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; + __pyx_v_threshold_type += 8; goto __pyx_L6; } __pyx_L6:; /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1189 - * assert_dtype(src, [UINT8]) + * threshold_type += 8 * * cdef np.ndarray out = new_array_like(src) # <<<<<<<<<<<<<< * @@ -9608,8 +9605,8 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvThreshold(PyObjec * return (out, threshold) * else: */ - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_v_use_otsu); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1199; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - if (__pyx_t_4) { + __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;} + if (__pyx_t_3) { /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1200 * @@ -9621,16 +9618,16 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvThreshold(PyObjec __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_GOTREF(__pyx_t_2); - __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1200; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __Pyx_GOTREF(((PyObject *)__pyx_t_3)); + __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_GOTREF(((PyObject *)__pyx_t_4)); __Pyx_INCREF(((PyObject *)__pyx_v_out)); - PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_v_out)); + PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_v_out)); __Pyx_GIVEREF(((PyObject *)__pyx_v_out)); - PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_2); + PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_r = ((PyObject *)__pyx_t_3); - __pyx_t_3 = 0; + __pyx_r = ((PyObject *)__pyx_t_4); + __pyx_t_4 = 0; goto __pyx_L0; goto __pyx_L7; } @@ -9656,11 +9653,10 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvThreshold(PyObjec __Pyx_XDECREF(__pyx_1); __Pyx_XDECREF(__pyx_2); __Pyx_XDECREF(__pyx_t_2); - __Pyx_XDECREF(__pyx_t_3); + __Pyx_XDECREF(__pyx_t_4); __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvThreshold"); __pyx_r = NULL; __pyx_L0:; - __Pyx_DECREF(__pyx_v_use_otsu); __Pyx_XDECREF((PyObject *)__pyx_v_out); __Pyx_XGIVEREF(__pyx_r); __Pyx_FinishRefcountContext(); @@ -9750,12 +9746,12 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvAdaptiveThreshold 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;} } else { - __pyx_v_adaptive_method = __pyx_k_139; + __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;} } else { - __pyx_v_threshold_type = __pyx_k_140; + __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;} @@ -9768,8 +9764,8 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvAdaptiveThreshold __pyx_v_param1 = ((double)5); } } else { - __pyx_v_adaptive_method = __pyx_k_139; - __pyx_v_threshold_type = __pyx_k_140; + __pyx_v_adaptive_method = __pyx_k_140; + __pyx_v_threshold_type = __pyx_k_141; __pyx_v_block_size = 3; __pyx_v_param1 = ((double)5); switch (PyTuple_GET_SIZE(__pyx_args)) { @@ -9847,7 +9843,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvAdaptiveThreshold */ __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_GOTREF(__pyx_t_2); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_138); 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 = 1213; __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_GOTREF(__pyx_t_3); @@ -9866,7 +9862,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvAdaptiveThreshold */ __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_GOTREF(__pyx_t_3); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_171); 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 = 1214; __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_GOTREF(__pyx_t_2); @@ -9889,9 +9885,9 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvAdaptiveThreshold */ __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_GOTREF(((PyObject *)__pyx_t_2)); - __Pyx_INCREF(__pyx_kp_172); - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_172); - __Pyx_GIVEREF(__pyx_kp_172); + __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_GOTREF(__pyx_t_3); __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; @@ -9930,7 +9926,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvAdaptiveThreshold */ __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_GOTREF(__pyx_t_2); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_173); 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 = 1218; __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_GOTREF(__pyx_t_3); @@ -9953,9 +9949,9 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvAdaptiveThreshold */ __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_GOTREF(((PyObject *)__pyx_t_3)); - __Pyx_INCREF(__pyx_kp_174); - PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_kp_174); - __Pyx_GIVEREF(__pyx_kp_174); + __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_GOTREF(__pyx_t_2); __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0; @@ -9989,9 +9985,9 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvAdaptiveThreshold */ __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_GOTREF(((PyObject *)__pyx_t_2)); - __Pyx_INCREF(__pyx_kp_175); - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_175); - __Pyx_GIVEREF(__pyx_kp_175); + __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_GOTREF(__pyx_t_3); __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0; @@ -10220,7 +10216,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( * assert_ndims(point_counts, [1]) * */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_169); 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 = 1246; __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_GOTREF(((PyObject *)__pyx_t_2)); @@ -10270,7 +10266,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( * cdef IplImage ipl_intrinsics * populate_iplimage(intrinsics, &ipl_intrinsics) */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_168); 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 = 1253; __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_GOTREF(__pyx_t_2); @@ -10321,7 +10317,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2( * cdef IplImage ipl_distortion * populate_iplimage(distortion, &ipl_distortion) */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_168); 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 = 1262; __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_GOTREF(__pyx_t_2); @@ -10594,10 +10590,10 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCor 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;} } else { - __pyx_v_flags = __pyx_k_142; + __pyx_v_flags = __pyx_k_143; } } else { - __pyx_v_flags = __pyx_k_142; + __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;} @@ -10828,7 +10824,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor if (unlikely(__pyx_kwds)) { Py_ssize_t kw_args = PyDict_Size(__pyx_kwds); PyObject* values[4] = {0,0,0,0}; - values[3] = __pyx_k_143; + values[3] = __pyx_k_144; switch (PyTuple_GET_SIZE(__pyx_args)) { case 4: values[3] = PyTuple_GET_ITEM(__pyx_args, 3); case 3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2); @@ -10868,7 +10864,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor __pyx_v_corners = ((PyArrayObject *)values[2]); __pyx_v_in_place = values[3]; } else { - __pyx_v_in_place = __pyx_k_143; + __pyx_v_in_place = __pyx_k_144; switch (PyTuple_GET_SIZE(__pyx_args)) { case 4: __pyx_v_in_place = PyTuple_GET_ITEM(__pyx_args, 3); @@ -13104,6 +13100,7 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_kp_threshold, __pyx_k_threshold, sizeof(__pyx_k_threshold), 1, 1, 1}, {&__pyx_kp_max_value, __pyx_k_max_value, sizeof(__pyx_k_max_value), 1, 1, 1}, {&__pyx_kp_threshold_type, __pyx_k_threshold_type, sizeof(__pyx_k_threshold_type), 1, 1, 1}, + {&__pyx_kp_use_otsu, __pyx_k_use_otsu, sizeof(__pyx_k_use_otsu), 1, 1, 1}, {&__pyx_kp_adaptive_method, __pyx_k_adaptive_method, sizeof(__pyx_k_adaptive_method), 1, 1, 1}, {&__pyx_kp_object_points, __pyx_k_object_points, sizeof(__pyx_k_object_points), 1, 1, 1}, {&__pyx_kp_image_points, __pyx_k_image_points, sizeof(__pyx_k_image_points), 1, 1, 1}, @@ -13227,12 +13224,12 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_kp_123, __pyx_k_123, sizeof(__pyx_k_123), 1, 1, 1}, {&__pyx_kp_CV_GAUSSIAN, __pyx_k_CV_GAUSSIAN, sizeof(__pyx_k_CV_GAUSSIAN), 1, 1, 1}, {&__pyx_kp_CV_THRESH_BINARY, __pyx_k_CV_THRESH_BINARY, sizeof(__pyx_k_CV_THRESH_BINARY), 1, 1, 1}, - {&__pyx_kp_138, __pyx_k_138, sizeof(__pyx_k_138), 1, 1, 1}, - {&__pyx_kp_141, __pyx_k_141, sizeof(__pyx_k_141), 1, 1, 1}, - {&__pyx_kp_144, __pyx_k_144, sizeof(__pyx_k_144), 1, 1, 1}, + {&__pyx_kp_139, __pyx_k_139, sizeof(__pyx_k_139), 1, 1, 1}, + {&__pyx_kp_142, __pyx_k_142, sizeof(__pyx_k_142), 1, 1, 1}, + {&__pyx_kp_145, __pyx_k_145, sizeof(__pyx_k_145), 1, 1, 1}, {&__pyx_kp_ValueError, __pyx_k_ValueError, sizeof(__pyx_k_ValueError), 1, 1, 1}, {&__pyx_kp_dtype, __pyx_k_dtype, sizeof(__pyx_k_dtype), 1, 1, 1}, - {&__pyx_kp_146, __pyx_k_146, sizeof(__pyx_k_146), 1, 1, 1}, + {&__pyx_kp_147, __pyx_k_147, sizeof(__pyx_k_147), 1, 1, 1}, {&__pyx_kp_reshape, __pyx_k_reshape, sizeof(__pyx_k_reshape), 1, 1, 1}, {&__pyx_kp_shape, __pyx_k_shape, sizeof(__pyx_k_shape), 1, 1, 1}, {&__pyx_kp_range, __pyx_k_range, sizeof(__pyx_k_range), 1, 1, 1}, @@ -13244,16 +13241,14 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_kp_RuntimeError, __pyx_k_RuntimeError, sizeof(__pyx_k_RuntimeError), 1, 1, 1}, {&__pyx_kp_CV_BLUR_NO_SCALE, __pyx_k_CV_BLUR_NO_SCALE, sizeof(__pyx_k_CV_BLUR_NO_SCALE), 1, 1, 1}, {&__pyx_kp_CV_BLUR, __pyx_k_CV_BLUR, sizeof(__pyx_k_CV_BLUR), 1, 1, 1}, - {&__pyx_kp_168, __pyx_k_168, sizeof(__pyx_k_168), 1, 1, 1}, {&__pyx_kp_169, __pyx_k_169, sizeof(__pyx_k_169), 1, 1, 1}, + {&__pyx_kp_170, __pyx_k_170, sizeof(__pyx_k_170), 1, 1, 1}, {&__pyx_kp_append, __pyx_k_append, sizeof(__pyx_k_append), 1, 1, 1}, {&__pyx_kp_KeyError, __pyx_k_KeyError, sizeof(__pyx_k_KeyError), 1, 1, 1}, - {&__pyx_kp_CV_THRESH_OTSU, __pyx_k_CV_THRESH_OTSU, sizeof(__pyx_k_CV_THRESH_OTSU), 1, 1, 1}, - {&__pyx_kp_171, __pyx_k_171, sizeof(__pyx_k_171), 1, 1, 1}, - {&__pyx_kp_173, __pyx_k_173, sizeof(__pyx_k_173), 1, 1, 1}, + {&__pyx_kp_172, __pyx_k_172, sizeof(__pyx_k_172), 1, 1, 1}, + {&__pyx_kp_174, __pyx_k_174, sizeof(__pyx_k_174), 1, 1, 1}, {&__pyx_kp_copy, __pyx_k_copy, sizeof(__pyx_k_copy), 1, 1, 1}, - {&__pyx_kp_145, __pyx_k_145, sizeof(__pyx_k_145), 0, 0, 0}, - {&__pyx_kp_147, __pyx_k_147, sizeof(__pyx_k_147), 0, 0, 0}, + {&__pyx_kp_146, __pyx_k_146, sizeof(__pyx_k_146), 0, 0, 0}, {&__pyx_kp_148, __pyx_k_148, sizeof(__pyx_k_148), 0, 0, 0}, {&__pyx_kp_149, __pyx_k_149, sizeof(__pyx_k_149), 0, 0, 0}, {&__pyx_kp_150, __pyx_k_150, sizeof(__pyx_k_150), 0, 0, 0}, @@ -13274,10 +13269,11 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_kp_165, __pyx_k_165, sizeof(__pyx_k_165), 0, 0, 0}, {&__pyx_kp_166, __pyx_k_166, sizeof(__pyx_k_166), 0, 0, 0}, {&__pyx_kp_167, __pyx_k_167, sizeof(__pyx_k_167), 0, 0, 0}, - {&__pyx_kp_170, __pyx_k_170, sizeof(__pyx_k_170), 0, 0, 0}, - {&__pyx_kp_172, __pyx_k_172, sizeof(__pyx_k_172), 0, 0, 0}, - {&__pyx_kp_174, __pyx_k_174, sizeof(__pyx_k_174), 0, 0, 0}, + {&__pyx_kp_168, __pyx_k_168, sizeof(__pyx_k_168), 0, 0, 0}, + {&__pyx_kp_171, __pyx_k_171, sizeof(__pyx_k_171), 0, 0, 0}, + {&__pyx_kp_173, __pyx_k_173, sizeof(__pyx_k_173), 0, 0, 0}, {&__pyx_kp_175, __pyx_k_175, sizeof(__pyx_k_175), 0, 0, 0}, + {&__pyx_kp_176, __pyx_k_176, sizeof(__pyx_k_176), 0, 0, 0}, {&__pyx_kp___getbuffer__, __pyx_k___getbuffer__, sizeof(__pyx_k___getbuffer__), 1, 1, 1}, {&__pyx_kp___releasebuffer__, __pyx_k___releasebuffer__, sizeof(__pyx_k___releasebuffer__), 1, 1, 1}, {&__pyx_kp_info, __pyx_k_info, sizeof(__pyx_k_info), 1, 1, 1}, @@ -13308,7 +13304,6 @@ static int __Pyx_InitGlobals(void) { __pyx_int_2 = PyInt_FromLong(2); if (unlikely(!__pyx_int_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; __pyx_int_neg_1 = PyInt_FromLong(-1); if (unlikely(!__pyx_int_neg_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; __pyx_int_6 = PyInt_FromLong(6); if (unlikely(!__pyx_int_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; - __pyx_int_0 = PyInt_FromLong(0); if (unlikely(!__pyx_int_0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; __pyx_int_15 = PyInt_FromLong(15); if (unlikely(!__pyx_int_15)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; return 0; @@ -17211,7 +17206,7 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1179 * * def cvThreshold(np.ndarray src, double threshold, double max_value=255, - * int threshold_type=CV_THRESH_BINARY): # <<<<<<<<<<<<<< + * int threshold_type=CV_THRESH_BINARY, use_otsu=False): # <<<<<<<<<<<<<< * * validate_array(src) */ @@ -17220,6 +17215,11 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) __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_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_GIVEREF(__pyx_k_138); /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1205 * @@ -17228,11 +17228,11 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) * int threshold_type=CV_THRESH_BINARY, * int block_size=3, double param1=5): */ - __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_138); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1205; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __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_k_139 = __pyx_t_5; + __pyx_k_140 = __pyx_t_5; /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1206 * def cvAdaptiveThreshold(np.ndarray src, double max_value, @@ -17245,7 +17245,7 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) __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_k_140 = __pyx_t_5; + __pyx_k_141 = __pyx_t_5; /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1300 * @@ -17254,11 +17254,11 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) * """ * Wrapper around the OpenCV cvFindChessboardCorners function. */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_141); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1300; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __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_k_142 = __pyx_t_5; + __pyx_k_143 = __pyx_t_5; /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1339 * @@ -17269,9 +17269,9 @@ PyMODINIT_FUNC PyInit_opencv_cv(void) */ __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_143 = __pyx_t_1; + __pyx_k_144 = __pyx_t_1; __pyx_t_1 = 0; - __Pyx_GIVEREF(__pyx_k_143); + __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 * cdef extern from "Python.h": # <<<<<<<<<<<<<< diff --git a/scikits/image/opencv/opencv_cv.pyx b/scikits/image/opencv/opencv_cv.pyx index f01e3b5b..13e5d075 100644 --- a/scikits/image/opencv/opencv_cv.pyx +++ b/scikits/image/opencv/opencv_cv.pyx @@ -1176,15 +1176,15 @@ def cvCvtColor(np.ndarray src, int code): return out def cvThreshold(np.ndarray src, double threshold, double max_value=255, - int threshold_type=CV_THRESH_BINARY): + int threshold_type=CV_THRESH_BINARY, use_otsu=False): validate_array(src) assert_nchannels(src, [1]) assert_dtype(src, [UINT8, FLOAT32]) - use_otsu = (threshold_type & CV_THRESH_OTSU) != 0 if use_otsu: assert_dtype(src, [UINT8]) + threshold_type += 8 cdef np.ndarray out = new_array_like(src) diff --git a/scikits/image/opencv/tests/test_opencv_cv.py b/scikits/image/opencv/tests/test_opencv_cv.py index 98f86625..fb1141c8 100644 --- a/scikits/image/opencv/tests/test_opencv_cv.py +++ b/scikits/image/opencv/tests/test_opencv_cv.py @@ -208,7 +208,7 @@ class TestThreshold(OpenCVTest): cvThreshold(self.lena_GRAY_U8, 100, threshold_type=CV_THRESH_TRUNC) cvThreshold(self.lena_GRAY_U8, 100, threshold_type=CV_THRESH_TOZERO) cvThreshold(self.lena_GRAY_U8, 100, threshold_type=CV_THRESH_TOZERO_INV) - cvThreshold(self.lena_GRAY_U8, 100, 1, CV_THRESH_BINARY+CV_THRESH_OTSU) + cvThreshold(self.lena_GRAY_U8, 100, 1, CV_THRESH_BINARY, use_otsu=True) class TestAdaptiveThreshold(OpenCVTest):