mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-10 11:03:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11627 from alalek:fix_python_cast_method_with_kw

Browse Source
This commit is contained in:
Alexander Alekhin 2018-05-31 11:38:39 +00:00
commit 1b27351f45
2 changed files with 50 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
modules/python/src2/cv2.cpp
View File

@ -10,6 +10,13 @@
#pragma warning(pop) #pragma warning(pop)
#endif #endif
#define CV_PY_FN_WITH_KW_(fn, flags) (PyCFunction)(void*)(PyCFunctionWithKeywords)(fn), (flags) | METH_VARARGS | METH_KEYWORDS
#define CV_PY_FN_NOARGS_(fn, flags) (PyCFunction)(fn), (flags) | METH_NOARGS
#define CV_PY_FN_WITH_KW(fn) CV_PY_FN_WITH_KW_(fn, 0)
#define CV_PY_FN_NOARGS(fn) CV_PY_FN_NOARGS_(fn, 0)
#define MODULESTR "cv2" #define MODULESTR "cv2"
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
#include <numpy/ndarrayobject.h> #include <numpy/ndarrayobject.h>
@ -474,8 +481,14 @@ typedef struct {
static bool PyObject_IsUMat(PyObject *o); static bool PyObject_IsUMat(PyObject *o);
// UMatWrapper init - try to map arguments from python to UMat constructors // UMatWrapper init - try to map arguments from python to UMat constructors
static int UMatWrapper_init(cv2_UMatWrapperObject *self, PyObject *args, PyObject *kwds) static int UMatWrapper_init(PyObject* self_, PyObject *args, PyObject *kwds)
{ {
cv2_UMatWrapperObject* self = (cv2_UMatWrapperObject*)self_;
if (self == NULL)
{
PyErr_SetString(PyExc_TypeError, "Internal error");
return -1;
}
self->um = NULL; self->um = NULL;
{ {
// constructor () // constructor ()
@ -548,8 +561,11 @@ static void UMatWrapper_dealloc(cv2_UMatWrapperObject* self)
// UMatWrapper.get() - returns numpy array by transferring UMat data to Mat and than wrapping it to numpy array // UMatWrapper.get() - returns numpy array by transferring UMat data to Mat and than wrapping it to numpy array
// (using numpy allocator - and so without unnecessary copy) // (using numpy allocator - and so without unnecessary copy)
static PyObject * UMatWrapper_get(cv2_UMatWrapperObject* self) static PyObject * UMatWrapper_get(PyObject* self_, PyObject * /*args*/)
{ {
cv2_UMatWrapperObject* self = (cv2_UMatWrapperObject*)self_;
if (self == NULL)
return failmsgp("Incorrect type of self (must be 'cv2_UMatWrapperObject')");
Mat m; Mat m;
m.allocator = &g_numpyAllocator; m.allocator = &g_numpyAllocator;
self->um->copyTo(m); self->um->copyTo(m);
@ -558,8 +574,11 @@ static PyObject * UMatWrapper_get(cv2_UMatWrapperObject* self)
} }
// UMatWrapper.handle() - returns the OpenCL handle of the UMat object // UMatWrapper.handle() - returns the OpenCL handle of the UMat object
static PyObject * UMatWrapper_handle(cv2_UMatWrapperObject* self, PyObject *args, PyObject *kwds) static PyObject * UMatWrapper_handle(PyObject* self_, PyObject *args, PyObject *kwds)
{ {
cv2_UMatWrapperObject* self = (cv2_UMatWrapperObject*)self_;
if (self == NULL)
return failmsgp("Incorrect type of self (must be 'cv2_UMatWrapperObject')");
const char *kwlist[] = {"accessFlags", NULL}; const char *kwlist[] = {"accessFlags", NULL};
int accessFlags; int accessFlags;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "i", (char**) kwlist, &accessFlags)) if (!PyArg_ParseTupleAndKeywords(args, kwds, "i", (char**) kwlist, &accessFlags))
@ -568,51 +587,60 @@ static PyObject * UMatWrapper_handle(cv2_UMatWrapperObject* self, PyObject *args
} }
// UMatWrapper.isContinuous() - returns true if the matrix data is continuous // UMatWrapper.isContinuous() - returns true if the matrix data is continuous
static PyObject * UMatWrapper_isContinuous(cv2_UMatWrapperObject* self) static PyObject * UMatWrapper_isContinuous(PyObject* self_, PyObject * /*args*/)
{ {
cv2_UMatWrapperObject* self = (cv2_UMatWrapperObject*)self_;
if (self == NULL)
return failmsgp("Incorrect type of self (must be 'cv2_UMatWrapperObject')");
return PyBool_FromLong(self->um->isContinuous()); return PyBool_FromLong(self->um->isContinuous());
} }
// UMatWrapper.isContinuous() - returns true if the matrix is a submatrix of another matrix // UMatWrapper.isContinuous() - returns true if the matrix is a submatrix of another matrix
static PyObject * UMatWrapper_isSubmatrix(cv2_UMatWrapperObject* self) static PyObject * UMatWrapper_isSubmatrix(PyObject* self_, PyObject * /*args*/)
{ {
cv2_UMatWrapperObject* self = (cv2_UMatWrapperObject*)self_;
if (self == NULL)
return failmsgp("Incorrect type of self (must be 'cv2_UMatWrapperObject')");
return PyBool_FromLong(self->um->isSubmatrix()); return PyBool_FromLong(self->um->isSubmatrix());
} }
// UMatWrapper.context() - returns the OpenCL context used by OpenCV UMat // UMatWrapper.context() - returns the OpenCL context used by OpenCV UMat
static PyObject * UMatWrapper_context(cv2_UMatWrapperObject*) static PyObject * UMatWrapper_context(PyObject* /*self_*/, PyObject * /*args*/)
{ {
return PyLong_FromVoidPtr(cv::ocl::Context::getDefault().ptr()); return PyLong_FromVoidPtr(cv::ocl::Context::getDefault().ptr());
} }
// UMatWrapper.context() - returns the OpenCL queue used by OpenCV UMat // UMatWrapper.context() - returns the OpenCL queue used by OpenCV UMat
static PyObject * UMatWrapper_queue(cv2_UMatWrapperObject*) static PyObject * UMatWrapper_queue(PyObject* /*self_*/, PyObject * /*args*/)
{ {
return PyLong_FromVoidPtr(cv::ocl::Queue::getDefault().ptr()); return PyLong_FromVoidPtr(cv::ocl::Queue::getDefault().ptr());
} }
static PyObject * UMatWrapper_offset_getter(cv2_UMatWrapperObject* self, void*) static PyObject * UMatWrapper_offset_getter(PyObject* self_, void*)
{ {
cv2_UMatWrapperObject* self = (cv2_UMatWrapperObject*)self_;
if (self == NULL)
return failmsgp("Incorrect type of self (must be 'cv2_UMatWrapperObject')");
return PyLong_FromSsize_t(self->um->offset); return PyLong_FromSsize_t(self->um->offset);
} }
static PyMethodDef UMatWrapper_methods[] = { static PyMethodDef UMatWrapper_methods[] = {
{"get", (PyCFunction)UMatWrapper_get, METH_NOARGS, {"get", CV_PY_FN_NOARGS(UMatWrapper_get),
"Returns numpy array" "Returns numpy array"
}, },
{"handle", (PyCFunction)UMatWrapper_handle, METH_VARARGS | METH_KEYWORDS, {"handle", CV_PY_FN_WITH_KW(UMatWrapper_handle),
"Returns UMat native handle" "Returns UMat native handle"
}, },
{"isContinuous", (PyCFunction)UMatWrapper_isContinuous, METH_NOARGS, {"isContinuous", CV_PY_FN_NOARGS(UMatWrapper_isContinuous),
"Returns true if the matrix data is continuous" "Returns true if the matrix data is continuous"
}, },
{"isSubmatrix", (PyCFunction)UMatWrapper_isSubmatrix, METH_NOARGS, {"isSubmatrix", CV_PY_FN_NOARGS(UMatWrapper_isSubmatrix),
"Returns true if the matrix is a submatrix of another matrix" "Returns true if the matrix is a submatrix of another matrix"
}, },
{"context", (PyCFunction)UMatWrapper_context, METH_NOARGS | METH_STATIC, {"context", CV_PY_FN_NOARGS_(UMatWrapper_context, METH_STATIC),
"Returns OpenCL context handle" "Returns OpenCL context handle"
}, },
{"queue", (PyCFunction)UMatWrapper_queue, METH_NOARGS | METH_STATIC, {"queue", CV_PY_FN_NOARGS_(UMatWrapper_queue, METH_STATIC),
"Returns OpenCL queue handle" "Returns OpenCL queue handle"
}, },
{NULL, NULL, 0, NULL} /* Sentinel */ {NULL, NULL, 0, NULL} /* Sentinel */
@ -1778,15 +1806,15 @@ static int convert_to_char(PyObject *o, char *dst, const char *name = "no_name")
#include "pyopencv_generated_funcs.h" #include "pyopencv_generated_funcs.h"
static PyMethodDef special_methods[] = { static PyMethodDef special_methods[] = {
{"redirectError", (PyCFunction)pycvRedirectError, METH_VARARGS | METH_KEYWORDS, "redirectError(onError) -> None"}, {"redirectError", CV_PY_FN_WITH_KW(pycvRedirectError), "redirectError(onError) -> None"},
#ifdef HAVE_OPENCV_HIGHGUI #ifdef HAVE_OPENCV_HIGHGUI
{"createTrackbar", pycvCreateTrackbar, METH_VARARGS, "createTrackbar(trackbarName, windowName, value, count, onChange) -> None"}, {"createTrackbar", (PyCFunction)pycvCreateTrackbar, METH_VARARGS, "createTrackbar(trackbarName, windowName, value, count, onChange) -> None"},
{"createButton", (PyCFunction)pycvCreateButton, METH_VARARGS | METH_KEYWORDS, "createButton(buttonName, onChange [, userData, buttonType, initialButtonState]) -> None"}, {"createButton", CV_PY_FN_WITH_KW(pycvCreateButton), "createButton(buttonName, onChange [, userData, buttonType, initialButtonState]) -> None"},
{"setMouseCallback", (PyCFunction)pycvSetMouseCallback, METH_VARARGS | METH_KEYWORDS, "setMouseCallback(windowName, onMouse [, param]) -> None"}, {"setMouseCallback", CV_PY_FN_WITH_KW(pycvSetMouseCallback), "setMouseCallback(windowName, onMouse [, param]) -> None"},
#endif #endif
#ifdef HAVE_OPENCV_DNN #ifdef HAVE_OPENCV_DNN
{"dnn_registerLayer", (PyCFunction)pyopencv_cv_dnn_registerLayer, METH_VARARGS | METH_KEYWORDS, "registerLayer(type, class) -> None"}, {"dnn_registerLayer", CV_PY_FN_WITH_KW(pyopencv_cv_dnn_registerLayer), "registerLayer(type, class) -> None"},
{"dnn_unregisterLayer", (PyCFunction)pyopencv_cv_dnn_unregisterLayer, METH_VARARGS | METH_KEYWORDS, "unregisterLayer(type) -> None"}, {"dnn_unregisterLayer", CV_PY_FN_WITH_KW(pyopencv_cv_dnn_unregisterLayer), "unregisterLayer(type) -> None"},
#endif #endif
{NULL, NULL}, {NULL, NULL},
}; };

8
modules/python/src2/gen2.py
View File

@ -599,13 +599,9 @@ class FuncInfo(object):
# Convert unicode chars to xml representation, but keep as string instead of bytes # Convert unicode chars to xml representation, but keep as string instead of bytes
full_docstring = full_docstring.encode('ascii', errors='xmlcharrefreplace').decode() full_docstring = full_docstring.encode('ascii', errors='xmlcharrefreplace').decode()
flags = ["METH_VARARGS", "METH_KEYWORDS"] return Template(' {"$py_funcname", CV_PY_FN_WITH_KW_($wrap_funcname, $flags), "$py_docstring"},\n'
if self.isclassmethod:
flags.append("METH_CLASS")
return Template(' {"$py_funcname", (PyCFunction)$wrap_funcname, $flags, "$py_docstring"},\n'
).substitute(py_funcname = self.variants[0].wname, wrap_funcname=self.get_wrapper_name(), ).substitute(py_funcname = self.variants[0].wname, wrap_funcname=self.get_wrapper_name(),
flags = " | ".join(flags), py_docstring = full_docstring) flags = 'METH_CLASS' if self.isclassmethod else '0', py_docstring = full_docstring)
def gen_code(self, codegen): def gen_code(self, codegen):
all_classes = codegen.classes all_classes = codegen.classes