third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python: fix "unsigned int" / "size_t" overloading conflict

Browse Source
This commit is contained in:
Alexander Alekhin
2018-09-08 07:33:23 +00:00
parent dca657a2fd
commit 89720ae24d
2 changed files with 96 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/python/src2/gen2.py
+42 -34
View File
@@ -70,25 +70,29 @@ static void pyopencv_${name}_dealloc(PyObject* self)
PyObject_Del(self);
}
template<> PyObject* pyopencv_from(const ${cname}& r)
template<>
struct PyOpenCV_Converter< ${cname} >
{
pyopencv_${name}_t *m = PyObject_NEW(pyopencv_${name}_t, &pyopencv_${name}_Type);
new (&m->v) ${cname}(r); //Copy constructor
return (PyObject*)m;
}
template<> bool pyopencv_to(PyObject* src, ${cname}& dst, const char* name)
{
if(!src || src == Py_None)
return true;
if(PyObject_TypeCheck(src, &pyopencv_${name}_Type))
static PyObject* from(const ${cname}& r)
{
dst = ((pyopencv_${name}_t*)src)->v;
return true;
pyopencv_${name}_t *m = PyObject_NEW(pyopencv_${name}_t, &pyopencv_${name}_Type);
new (&m->v) ${cname}(r); //Copy constructor
return (PyObject*)m;
}
failmsg("Expected ${cname} for argument '%%s'", name);
return false;
}
static bool to(PyObject* src, ${cname}& dst, const char* name)
{
if(!src || src == Py_None)
return true;
if(PyObject_TypeCheck(src, &pyopencv_${name}_Type))
{
dst = ((pyopencv_${name}_t*)src)->v;
return true;
}
failmsg("Expected ${cname} for argument '%%s'", name);
return false;
}
};
""" % head_init_str)
gen_template_mappable = Template("""
@@ -121,27 +125,31 @@ static void pyopencv_${name}_dealloc(PyObject* self)
PyObject_Del(self);
}
template<> PyObject* pyopencv_from(const Ptr<${cname}>& r)
template<>
struct PyOpenCV_Converter< Ptr<${cname}> >
{
pyopencv_${name}_t *m = PyObject_NEW(pyopencv_${name}_t, &pyopencv_${name}_Type);
new (&(m->v)) Ptr<$cname1>(); // init Ptr with placement new
m->v = r;
return (PyObject*)m;
}
template<> bool pyopencv_to(PyObject* src, Ptr<${cname}>& dst, const char* name)
{
if(!src || src == Py_None)
return true;
if(PyObject_TypeCheck(src, &pyopencv_${name}_Type))
static PyObject* from(const Ptr<${cname}>& r)
{
dst = ((pyopencv_${name}_t*)src)->v.dynamicCast<${cname}>();
return true;
pyopencv_${name}_t *m = PyObject_NEW(pyopencv_${name}_t, &pyopencv_${name}_Type);
new (&(m->v)) Ptr<$cname1>(); // init Ptr with placement new
m->v = r;
return (PyObject*)m;
}
${mappable_code}
failmsg("Expected ${cname} for argument '%%s'", name);
return false;
}
static bool to(PyObject* src, Ptr<${cname}>& dst, const char* name)
{
if(!src || src == Py_None)
return true;
if(PyObject_TypeCheck(src, &pyopencv_${name}_Type))
{
dst = ((pyopencv_${name}_t*)src)->v.dynamicCast<${cname}>();
return true;
}
${mappable_code}
failmsg("Expected ${cname} for argument '%%s'", name);
return false;
}
};
""" % head_init_str)