POSIT object generated

git-svn-id: https://code.ros.org/svn/opencv/trunk@2766 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/interfaces/python/cv.cpp b/opencv/interfaces/python/cv.cpp
index 3225f10fd36f18c032d92cac36d0f59fb1332405..3ee858e95077bff41a4898211f5ffbcab0a856e7 100644 (file)
--- a/opencv/interfaces/python/cv.cpp
+++ b/opencv/interfaces/python/cv.cpp
@@ -120,11 +120,6 @@ struct cvcontourtree_t {
   CvContourTree *a;
 };
 
-struct cvpositobject_t {
-  PyObject_HEAD
-  CvPOSITObject *a;
-};
-
 struct cvrng_t {
   PyObject_HEAD
   CvRNG a;
@@ -1034,29 +1029,6 @@ static void cvfont_specials(void) { }
 
 /************************************************************************/
 
-/* cvpositobject */
-
-static void cvpositobject_dealloc(PyObject *self)
-{
-  cvpositobject_t *pi = (cvpositobject_t*)self;
-  cvReleasePOSITObject(&(pi->a));
-  PyObject_Del(self);
-}
-
-static PyTypeObject cvpositobject_Type = {
-  PyObject_HEAD_INIT(&PyType_Type)
-  0,                                      /*size*/
-  MODULESTR".cvpositobject",                     /*name*/
-  sizeof(cvpositobject_t),                       /*basicsize*/
-};
-
-static void cvpositobject_specials(void)
-{
-  cvpositobject_Type.tp_dealloc = cvpositobject_dealloc;
-}
-
-/************************************************************************/
-
 /* cvrng */
 
 static PyTypeObject cvrng_Type = {
@@ -2148,17 +2120,6 @@ static int convert_to_CvContourTreePTR(PyObject *o, CvContourTree** dst, const c
   }
 }
 
-static int convert_to_CvPOSITObjectPTR(PyObject *o, CvPOSITObject** dst, const char *name = "no_name")
-{
-  if (PyType_IsSubtype(o->ob_type, &cvpositobject_Type)) {
-    (*dst) = ((cvpositobject_t*)o)->a;
-    return 1;
-  } else {
-    (*dst) = (CvPOSITObject*)NULL;
-    return failmsg("Expected CvPOSITObject for argument '%s'", name);
-  }
-}
-
 static int convert_to_CvRNGPTR(PyObject *o, CvRNG** dst, const char *name = "no_name")
 {
   if (PyType_IsSubtype(o->ob_type, &cvrng_Type)) {
@@ -2598,13 +2559,6 @@ static PyObject *FROM_CvMatNDPTR(CvMatND *r)
   return pythonize_CvMatND(m);
 }
 
-static PyObject *FROM_CvPOSITObjectPTR(CvPOSITObject *r)
-{
-  cvpositobject_t *m = PyObject_NEW(cvpositobject_t, &cvpositobject_Type);
-  m->a = r;
-  return (PyObject*)m;
-}
-
 static PyObject *FROM_CvRNG(CvRNG r)
 {
   cvrng_t *m = PyObject_NEW(cvrng_t, &cvrng_Type);
@@ -3885,7 +3839,6 @@ void initcv()
   MKTYPE(cvmatnd);
   MKTYPE(cvmemstorage);
   MKTYPE(cvmoments);
-  MKTYPE(cvpositobject);
   MKTYPE(cvsubdiv2dedge);
   MKTYPE(cvrng);
   MKTYPE(cvseq);

diff --git a/opencv/interfaces/python/gen.py b/opencv/interfaces/python/gen.py
index ed771f4a955b58dd31f1aa2a060f006217bf45bd..7e5011e008cbd874f88f0fedb166a224b31f07ea 100644 (file)
--- a/opencv/interfaces/python/gen.py
+++ b/opencv/interfaces/python/gen.py
@@ -423,6 +423,7 @@ objects = [
         "anchorX" : 'i',
         "anchorY" : 'i',
     }),
+    ( 'CvPOSITObject', {}),
     ( 'CvStereoBMState', {
         "preFilterType" : 'i',
         "preFilterSize" : 'i',