generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#362, CvMoments fields now exposed, smoke tested by test_moments

Browse Source
This commit is contained in:
James Bowman
2010-05-27 22:36:26 +00:00
parent 1e5f012e7f
commit 6ebdcb879b
3 changed files with 118 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
modules/python/cv.cpp
View File

@@ -92,11 +92,6 @@ typedef IplImage ROIplImage;
typedef const CvMat ROCvMat;
typedef PyObject PyCallableObject;
struct cvmoments_t {
PyObject_HEAD
CvMoments a;
};
struct cvfont_t {
PyObject_HEAD
CvFont a;
@@ -962,21 +957,6 @@ static void memtrack_specials(void)
/************************************************************************/
/* cvmoments */
static PyTypeObject cvmoments_Type = {
PyObject_HEAD_INIT(&PyType_Type)
0, /*size*/
MODULESTR".cvmoments", /*name*/
sizeof(cvmoments_t), /*basicsize*/
};
static void cvmoments_specials(void)
{
}
/************************************************************************/
/* cvmemstorage */
static void cvmemstorage_dealloc(PyObject *self)
@@ -2058,17 +2038,6 @@ static int convert_to_floatPTRPTR(PyObject *o, float*** dst, const char *name =
return 1;
}
static int convert_to_CvMomentsPTR(PyObject *o, CvMoments** dst, const char *name = "no_name")
{
if (PyType_IsSubtype(o->ob_type, &cvmoments_Type)) {
(*dst) = &(((cvmoments_t*)o)->a);
return 1;
} else {
(*dst) = (CvMoments*)NULL;
return failmsg("Expected CvMoments for argument '%s'", name);
}
}
static int convert_to_CvFontPTR(PyObject *o, CvFont** dst, const char *name = "no_name")
{
if (PyType_IsSubtype(o->ob_type, &cvfont_Type)) {
@@ -2547,13 +2516,6 @@ static PyObject *FROM_CvRNG(CvRNG r)
return (PyObject*)m;
}
static PyObject *FROM_CvMoments(CvMoments r)
{
cvmoments_t *m = PyObject_NEW(cvmoments_t, &cvmoments_Type);
m->a = r;
return (PyObject*)m;
}
static PyObject *FROM_CvContourTreePTR(CvContourTree *r)
{
cvcontourtree_t *m = PyObject_NEW(cvcontourtree_t, &cvcontourtree_Type);
@@ -3615,6 +3577,13 @@ static PyObject *temp_test(PyObject *self, PyObject *args)
printf("count=%d\n", count);
#endif
#if 0
CvMat *src = cvCreateMat(512, 512, CV_8UC3);
CvMat *dst = cvCreateMat(512, 512, CV_8UC3);
cvPyrMeanShiftFiltering(src, dst, 5, 5);
return FROM_CvMat(src);
#endif
return PyFloat_FromDouble(0.0);
}
@@ -3845,7 +3814,6 @@ void initcv()
MKTYPE(cvmat);
MKTYPE(cvmatnd);
MKTYPE(cvmemstorage);
MKTYPE(cvmoments);
MKTYPE(cvsubdiv2dedge);
MKTYPE(cvrng);
MKTYPE(cvseq);