generated CvVideoWriter

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

diff --git a/opencv/interfaces/python/cv.cpp b/opencv/interfaces/python/cv.cpp
index 3ee858e95077bff41a4898211f5ffbcab0a856e7..0243675bc2c973b623e3eb236cbd2e9c1d1e59df 100644 (file)
--- a/opencv/interfaces/python/cv.cpp
+++ b/opencv/interfaces/python/cv.cpp
@@ -93,11 +93,6 @@ struct cvcapture_t {
   CvCapture *a;
 };
 
-struct cvvideowriter_t {
-  PyObject_HEAD
-  CvVideoWriter *a;
-};
-
 typedef IplImage ROIplImage;
 
 struct cvmoments_t {
@@ -951,31 +946,6 @@ static void cvcapture_specials(void)
   cvcapture_Type.tp_dealloc = cvcapture_dealloc;
 }
 
-/************************************************************************/
-
-/* cvvideowriter */
-
-static void cvvideowriter_dealloc(PyObject *self)
-{
-  cvvideowriter_t *pi = (cvvideowriter_t*)self;
-  cvReleaseVideoWriter(&(pi->a));
-  PyObject_Del(self);
-}
-
-static PyTypeObject cvvideowriter_Type = {
-  PyObject_HEAD_INIT(&PyType_Type)
-  0,                                      /*size*/
-  MODULESTR".cvvideowriter",              /*name*/
-  sizeof(cvvideowriter_t),                /*basicsize*/
-};
-
-static void cvvideowriter_specials(void)
-{
-  cvvideowriter_Type.tp_dealloc = cvvideowriter_dealloc;
-}
-
-
-
 /************************************************************************/
 
 /* cvmoments */
@@ -2065,17 +2035,6 @@ static int convert_to_CvCapturePTR(PyObject *o, CvCapture** dst, const char *nam
   }
 }
 
-static int convert_to_CvVideoWriterPTR(PyObject *o, CvVideoWriter** dst, const char *name = "no_name")
-{
-  if (PyType_IsSubtype(o->ob_type, &cvvideowriter_Type)) {
-    *dst = ((cvvideowriter_t*)o)->a;
-    return 1;
-  } else {
-    (*dst) = (CvVideoWriter*)NULL;
-    return failmsg("Expected CvVideoWriter for argument '%s'", name);
-  }
-}
-
 static int convert_to_CvMomentsPTR(PyObject *o, CvMoments** dst, const char *name = "no_name")
 {
   if (PyType_IsSubtype(o->ob_type, &cvmoments_Type)) {
@@ -2463,13 +2422,6 @@ static PyObject *FROM_CvCapturePTR(CvCapture *r)
   return (PyObject*)c;
 }
 
-static PyObject *FROM_CvVideoWriterPTR(CvVideoWriter *r)
-{
-  cvvideowriter_t *c = PyObject_NEW(cvvideowriter_t, &cvvideowriter_Type);
-  c->a = r;
-  return (PyObject*)c;
-}
-
 typedef CvPoint2D32f CvPoint2D32f_4[4];
 static PyObject *FROM_CvPoint2D32f_4(CvPoint2D32f* r)
 {
@@ -3845,7 +3797,6 @@ void initcv()
   MKTYPE(cvset);
   MKTYPE(cvsubdiv2d);
   MKTYPE(cvsubdiv2dpoint);
-  MKTYPE(cvvideowriter);
   MKTYPE(iplimage);
   MKTYPE(memtrack);
 

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