X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=interfaces%2Fswig%2Fpython%2Fcv.py;fp=interfaces%2Fswig%2Fpython%2Fcv.py;h=e8b50d4e9d4d4986956ecaeaa9971e0f7806e7ea;hb=e4c14cdbdf2fe805e79cd96ded236f57e7b89060;hp=62441ac9d4d550e2f6a0c50ab2de4be1d048696d;hpb=454138ff8a20f6edb9b65a910101403d8b520643;p=opencv

diff --git a/interfaces/swig/python/cv.py b/interfaces/swig/python/cv.py
index 62441ac..e8b50d4 100644
--- a/interfaces/swig/python/cv.py
+++ b/interfaces/swig/python/cv.py
@@ -1,12 +1,32 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.35
+# Version 1.3.40
 #
-# Don't modify this file, modify the SWIG interface instead.
+# Do not make changes to this file unless you know what you are doing--modify
+# the SWIG interface file instead.
 # This file is compatible with both classic and new-style classes.
 
-import _cv
-import new
-new_instancemethod = new.instancemethod
+from sys import version_info
+if version_info >= (2,6,0):
+    def swig_import_helper():
+        from os.path import dirname
+        import imp
+        fp = None
+        try:
+            fp, pathname, description = imp.find_module('_cv', [dirname(__file__)])
+        except ImportError:
+            import _cv
+            return _cv
+        if fp is not None:
+            try:
+                _mod = imp.load_module('_cv', fp, pathname, description)
+            finally:
+                fp.close()
+            return _mod
+    _cv = swig_import_helper()
+    del swig_import_helper
+else:
+    import _cv
+del version_info
 try:
     _swig_property = property
 except NameError:
@@ -14,7 +34,7 @@ except NameError:
 def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
     if (name == "thisown"): return self.this.own(value)
     if (name == "this"):
-        if type(value).__name__ == 'PySwigObject':
+        if type(value).__name__ == 'SwigPyObject':
             self.__dict__[name] = value
             return
     method = class_type.__swig_setmethods__.get(name,None)
@@ -31,21 +51,19 @@ def _swig_getattr(self,class_type,name):
     if (name == "thisown"): return self.this.own()
     method = class_type.__swig_getmethods__.get(name,None)
     if method: return method(self)
-    raise AttributeError,name
+    raise AttributeError(name)
 
 def _swig_repr(self):
     try: strthis = "proxy of " + self.this.__repr__()
     except: strthis = ""
     return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
 
-import types
 try:
-    _object = types.ObjectType
+    _object = object
     _newclass = 1
 except AttributeError:
     class _object : pass
     _newclass = 0
-del types
 
 
 class CvRNG_Wrapper(_object):
@@ -60,21 +78,21 @@ class CvRNG_Wrapper(_object):
         this = _cv.new_CvRNG_Wrapper(*args)
         try: self.this.append(this)
         except: self.this = this
-    def ptr(*args):
+    def ptr(self):
         """ptr(self) -> CvRNG"""
-        return _cv.CvRNG_Wrapper_ptr(*args)
+        return _cv.CvRNG_Wrapper_ptr(self)
 
-    def ref(*args):
+    def ref(self):
         """ref(self) -> CvRNG"""
-        return _cv.CvRNG_Wrapper_ref(*args)
+        return _cv.CvRNG_Wrapper_ref(self)
 
-    def __eq__(*args):
+    def __eq__(self, *args):
         """__eq__(self, CvRNG_Wrapper x) -> bool"""
-        return _cv.CvRNG_Wrapper___eq__(*args)
+        return _cv.CvRNG_Wrapper___eq__(self, *args)
 
-    def __ne__(*args):
+    def __ne__(self, *args):
         """__ne__(self, CvRNG_Wrapper x) -> bool"""
-        return _cv.CvRNG_Wrapper___ne__(*args)
+        return _cv.CvRNG_Wrapper___ne__(self, *args)
 
     __swig_destroy__ = _cv.delete_CvRNG_Wrapper
     __del__ = lambda self : None;
@@ -93,256 +111,273 @@ class CvSubdiv2DEdge_Wrapper(_object):
         this = _cv.new_CvSubdiv2DEdge_Wrapper(*args)
         try: self.this.append(this)
         except: self.this = this
-    def ptr(*args):
+    def ptr(self):
         """ptr(self) -> CvSubdiv2DEdge"""
-        return _cv.CvSubdiv2DEdge_Wrapper_ptr(*args)
+        return _cv.CvSubdiv2DEdge_Wrapper_ptr(self)
 
-    def ref(*args):
+    def ref(self):
         """ref(self) -> CvSubdiv2DEdge"""
-        return _cv.CvSubdiv2DEdge_Wrapper_ref(*args)
+        return _cv.CvSubdiv2DEdge_Wrapper_ref(self)
 
-    def __eq__(*args):
+    def __eq__(self, *args):
         """__eq__(self, CvSubdiv2DEdge_Wrapper x) -> bool"""
-        return _cv.CvSubdiv2DEdge_Wrapper___eq__(*args)
+        return _cv.CvSubdiv2DEdge_Wrapper___eq__(self, *args)
 
-    def __ne__(*args):
+    def __ne__(self, *args):
         """__ne__(self, CvSubdiv2DEdge_Wrapper x) -> bool"""
-        return _cv.CvSubdiv2DEdge_Wrapper___ne__(*args)
+        return _cv.CvSubdiv2DEdge_Wrapper___ne__(self, *args)
 
     __swig_destroy__ = _cv.delete_CvSubdiv2DEdge_Wrapper
     __del__ = lambda self : None;
 CvSubdiv2DEdge_Wrapper_swigregister = _cv.CvSubdiv2DEdge_Wrapper_swigregister
 CvSubdiv2DEdge_Wrapper_swigregister(CvSubdiv2DEdge_Wrapper)
 
-class PySwigIterator(_object):
-    """Proxy of C++ PySwigIterator class"""
+class SwigPyIterator(_object):
+    """Proxy of C++ swig::SwigPyIterator class"""
     __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, PySwigIterator, name, value)
+    __setattr__ = lambda self, name, value: _swig_setattr(self, SwigPyIterator, name, value)
     __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, PySwigIterator, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
+    __getattr__ = lambda self, name: _swig_getattr(self, SwigPyIterator, name)
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
-    __swig_destroy__ = _cv.delete_PySwigIterator
+    __swig_destroy__ = _cv.delete_SwigPyIterator
     __del__ = lambda self : None;
-    def value(*args):
+    def value(self):
         """value(self) -> PyObject"""
-        return _cv.PySwigIterator_value(*args)
+        return _cv.SwigPyIterator_value(self)
 
-    def incr(*args):
+    def incr(self, n = 1):
         """
-        incr(self, size_t n=1) -> PySwigIterator
-        incr(self) -> PySwigIterator
+        incr(self, size_t n = 1) -> SwigPyIterator
+        incr(self) -> SwigPyIterator
         """
-        return _cv.PySwigIterator_incr(*args)
+        return _cv.SwigPyIterator_incr(self, n)
 
-    def decr(*args):
+    def decr(self, n = 1):
         """
-        decr(self, size_t n=1) -> PySwigIterator
-        decr(self) -> PySwigIterator
+        decr(self, size_t n = 1) -> SwigPyIterator
+        decr(self) -> SwigPyIterator
         """
-        return _cv.PySwigIterator_decr(*args)
+        return _cv.SwigPyIterator_decr(self, n)
 
-    def distance(*args):
-        """distance(self, PySwigIterator x) -> ptrdiff_t"""
-        return _cv.PySwigIterator_distance(*args)
+    def distance(self, *args):
+        """distance(self, SwigPyIterator x) -> ptrdiff_t"""
+        return _cv.SwigPyIterator_distance(self, *args)
 
-    def equal(*args):
-        """equal(self, PySwigIterator x) -> bool"""
-        return _cv.PySwigIterator_equal(*args)
+    def equal(self, *args):
+        """equal(self, SwigPyIterator x) -> bool"""
+        return _cv.SwigPyIterator_equal(self, *args)
 
-    def copy(*args):
-        """copy(self) -> PySwigIterator"""
-        return _cv.PySwigIterator_copy(*args)
+    def copy(self):
+        """copy(self) -> SwigPyIterator"""
+        return _cv.SwigPyIterator_copy(self)
 
-    def next(*args):
+    def next(self):
         """next(self) -> PyObject"""
-        return _cv.PySwigIterator_next(*args)
+        return _cv.SwigPyIterator_next(self)
 
-    def previous(*args):
+    def __next__(self):
+        """__next__(self) -> PyObject"""
+        return _cv.SwigPyIterator___next__(self)
+
+    def previous(self):
         """previous(self) -> PyObject"""
-        return _cv.PySwigIterator_previous(*args)
+        return _cv.SwigPyIterator_previous(self)
 
-    def advance(*args):
-        """advance(self, ptrdiff_t n) -> PySwigIterator"""
-        return _cv.PySwigIterator_advance(*args)
+    def advance(self, *args):
+        """advance(self, ptrdiff_t n) -> SwigPyIterator"""
+        return _cv.SwigPyIterator_advance(self, *args)
 
-    def __eq__(*args):
-        """__eq__(self, PySwigIterator x) -> bool"""
-        return _cv.PySwigIterator___eq__(*args)
+    def __eq__(self, *args):
+        """__eq__(self, SwigPyIterator x) -> bool"""
+        return _cv.SwigPyIterator___eq__(self, *args)
 
-    def __ne__(*args):
-        """__ne__(self, PySwigIterator x) -> bool"""
-        return _cv.PySwigIterator___ne__(*args)
+    def __ne__(self, *args):
+        """__ne__(self, SwigPyIterator x) -> bool"""
+        return _cv.SwigPyIterator___ne__(self, *args)
 
-    def __iadd__(*args):
-        """__iadd__(self, ptrdiff_t n) -> PySwigIterator"""
-        return _cv.PySwigIterator___iadd__(*args)
+    def __iadd__(self, *args):
+        """__iadd__(self, ptrdiff_t n) -> SwigPyIterator"""
+        return _cv.SwigPyIterator___iadd__(self, *args)
 
-    def __isub__(*args):
-        """__isub__(self, ptrdiff_t n) -> PySwigIterator"""
-        return _cv.PySwigIterator___isub__(*args)
+    def __isub__(self, *args):
+        """__isub__(self, ptrdiff_t n) -> SwigPyIterator"""
+        return _cv.SwigPyIterator___isub__(self, *args)
 
-    def __add__(*args):
-        """__add__(self, ptrdiff_t n) -> PySwigIterator"""
-        return _cv.PySwigIterator___add__(*args)
+    def __add__(self, *args):
+        """__add__(self, ptrdiff_t n) -> SwigPyIterator"""
+        return _cv.SwigPyIterator___add__(self, *args)
 
-    def __sub__(*args):
+    def __sub__(self, *args):
         """
-        __sub__(self, ptrdiff_t n) -> PySwigIterator
-        __sub__(self, PySwigIterator x) -> ptrdiff_t
+        __sub__(self, ptrdiff_t n) -> SwigPyIterator
+        __sub__(self, SwigPyIterator x) -> ptrdiff_t
         """
-        return _cv.PySwigIterator___sub__(*args)
+        return _cv.SwigPyIterator___sub__(self, *args)
 
     def __iter__(self): return self
-PySwigIterator_swigregister = _cv.PySwigIterator_swigregister
-PySwigIterator_swigregister(PySwigIterator)
+SwigPyIterator_swigregister = _cv.SwigPyIterator_swigregister
+SwigPyIterator_swigregister(SwigPyIterator)
 
 class FloatVector(_object):
-    """Proxy of C++ FloatVector class"""
+    """Proxy of C++ std::vector<(float)> class"""
     __swig_setmethods__ = {}
     __setattr__ = lambda self, name, value: _swig_setattr(self, FloatVector, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, FloatVector, name)
     __repr__ = _swig_repr
-    def iterator(*args):
-        """iterator(self, PyObject PYTHON_SELF) -> PySwigIterator"""
-        return _cv.FloatVector_iterator(*args)
+    def iterator(self):
+        """iterator(self) -> SwigPyIterator"""
+        return _cv.FloatVector_iterator(self)
 
     def __iter__(self): return self.iterator()
-    def __nonzero__(*args):
+    def __nonzero__(self):
         """__nonzero__(self) -> bool"""
-        return _cv.FloatVector___nonzero__(*args)
+        return _cv.FloatVector___nonzero__(self)
+
+    def __bool__(self):
+        """__bool__(self) -> bool"""
+        return _cv.FloatVector___bool__(self)
 
-    def __len__(*args):
+    def __len__(self):
         """__len__(self) -> size_type"""
-        return _cv.FloatVector___len__(*args)
+        return _cv.FloatVector___len__(self)
 
-    def pop(*args):
+    def pop(self):
         """pop(self) -> value_type"""
-        return _cv.FloatVector_pop(*args)
+        return _cv.FloatVector_pop(self)
 
-    def __getslice__(*args):
+    def __getslice__(self, *args):
         """__getslice__(self, difference_type i, difference_type j) -> FloatVector"""
-        return _cv.FloatVector___getslice__(*args)
+        return _cv.FloatVector___getslice__(self, *args)
 
-    def __setslice__(*args):
+    def __setslice__(self, *args):
         """__setslice__(self, difference_type i, difference_type j, FloatVector v)"""
-        return _cv.FloatVector___setslice__(*args)
+        return _cv.FloatVector___setslice__(self, *args)
 
-    def __delslice__(*args):
+    def __delslice__(self, *args):
         """__delslice__(self, difference_type i, difference_type j)"""
-        return _cv.FloatVector___delslice__(*args)
+        return _cv.FloatVector___delslice__(self, *args)
 
-    def __delitem__(*args):
-        """__delitem__(self, difference_type i)"""
-        return _cv.FloatVector___delitem__(*args)
+    def __delitem__(self, *args):
+        """
+        __delitem__(self, difference_type i)
+        __delitem__(self, PySliceObject slice)
+        """
+        return _cv.FloatVector___delitem__(self, *args)
 
-    def __getitem__(*args):
-        """__getitem__(self, difference_type i) -> value_type"""
-        return _cv.FloatVector___getitem__(*args)
+    def __getitem__(self, *args):
+        """
+        __getitem__(self, PySliceObject slice) -> FloatVector
+        __getitem__(self, difference_type i) -> value_type
+        """
+        return _cv.FloatVector___getitem__(self, *args)
 
-    def __setitem__(*args):
-        """__setitem__(self, difference_type i, value_type x)"""
-        return _cv.FloatVector___setitem__(*args)
+    def __setitem__(self, *args):
+        """
+        __setitem__(self, PySliceObject slice, FloatVector v)
+        __setitem__(self, difference_type i, value_type x)
+        """
+        return _cv.FloatVector___setitem__(self, *args)
 
-    def append(*args):
+    def append(self, *args):
         """append(self, value_type x)"""
-        return _cv.FloatVector_append(*args)
+        return _cv.FloatVector_append(self, *args)
 
-    def empty(*args):
+    def empty(self):
         """empty(self) -> bool"""
-        return _cv.FloatVector_empty(*args)
+        return _cv.FloatVector_empty(self)
 
-    def size(*args):
+    def size(self):
         """size(self) -> size_type"""
-        return _cv.FloatVector_size(*args)
+        return _cv.FloatVector_size(self)
 
-    def clear(*args):
+    def clear(self):
         """clear(self)"""
-        return _cv.FloatVector_clear(*args)
+        return _cv.FloatVector_clear(self)
 
-    def swap(*args):
+    def swap(self, *args):
         """swap(self, FloatVector v)"""
-        return _cv.FloatVector_swap(*args)
+        return _cv.FloatVector_swap(self, *args)
 
-    def get_allocator(*args):
+    def get_allocator(self):
         """get_allocator(self) -> allocator_type"""
-        return _cv.FloatVector_get_allocator(*args)
+        return _cv.FloatVector_get_allocator(self)
 
-    def begin(*args):
+    def begin(self):
         """begin(self) -> const_iterator"""
-        return _cv.FloatVector_begin(*args)
+        return _cv.FloatVector_begin(self)
 
-    def end(*args):
+    def end(self):
         """end(self) -> const_iterator"""
-        return _cv.FloatVector_end(*args)
+        return _cv.FloatVector_end(self)
 
-    def rbegin(*args):
+    def rbegin(self):
         """rbegin(self) -> const_reverse_iterator"""
-        return _cv.FloatVector_rbegin(*args)
+        return _cv.FloatVector_rbegin(self)
 
-    def rend(*args):
+    def rend(self):
         """rend(self) -> const_reverse_iterator"""
-        return _cv.FloatVector_rend(*args)
+        return _cv.FloatVector_rend(self)
 
-    def pop_back(*args):
+    def pop_back(self):
         """pop_back(self)"""
-        return _cv.FloatVector_pop_back(*args)
+        return _cv.FloatVector_pop_back(self)
 
-    def erase(*args):
+    def erase(self, *args):
         """
         erase(self, iterator pos) -> iterator
         erase(self, iterator first, iterator last) -> iterator
         """
-        return _cv.FloatVector_erase(*args)
+        return _cv.FloatVector_erase(self, *args)
 
     def __init__(self, *args): 
         """
         __init__(self) -> FloatVector
-        __init__(self, FloatVector ?) -> FloatVector
+        __init__(self, FloatVector arg0) -> FloatVector
         __init__(self, size_type size) -> FloatVector
         __init__(self, size_type size, value_type value) -> FloatVector
         """
         this = _cv.new_FloatVector(*args)
         try: self.this.append(this)
         except: self.this = this
-    def push_back(*args):
+    def push_back(self, *args):
         """push_back(self, value_type x)"""
-        return _cv.FloatVector_push_back(*args)
+        return _cv.FloatVector_push_back(self, *args)
 
-    def front(*args):
+    def front(self):
         """front(self) -> value_type"""
-        return _cv.FloatVector_front(*args)
+        return _cv.FloatVector_front(self)
 
-    def back(*args):
+    def back(self):
         """back(self) -> value_type"""
-        return _cv.FloatVector_back(*args)
+        return _cv.FloatVector_back(self)
 
-    def assign(*args):
+    def assign(self, *args):
         """assign(self, size_type n, value_type x)"""
-        return _cv.FloatVector_assign(*args)
+        return _cv.FloatVector_assign(self, *args)
 
-    def resize(*args):
+    def resize(self, *args):
         """
         resize(self, size_type new_size)
         resize(self, size_type new_size, value_type x)
         """
-        return _cv.FloatVector_resize(*args)
+        return _cv.FloatVector_resize(self, *args)
 
-    def insert(*args):
+    def insert(self, *args):
         """
         insert(self, iterator pos, value_type x) -> iterator
         insert(self, iterator pos, size_type n, value_type x)
         """
-        return _cv.FloatVector_insert(*args)
+        return _cv.FloatVector_insert(self, *args)
 
-    def reserve(*args):
+    def reserve(self, *args):
         """reserve(self, size_type n)"""
-        return _cv.FloatVector_reserve(*args)
+        return _cv.FloatVector_reserve(self, *args)
 
-    def capacity(*args):
+    def capacity(self):
         """capacity(self) -> size_type"""
-        return _cv.FloatVector_capacity(*args)
+        return _cv.FloatVector_capacity(self)
 
     __swig_destroy__ = _cv.delete_FloatVector
     __del__ = lambda self : None;
@@ -350,160 +385,170 @@ FloatVector_swigregister = _cv.FloatVector_swigregister
 FloatVector_swigregister(FloatVector)
 
 class CvPointVector(_object):
-    """Proxy of C++ CvPointVector class"""
+    """Proxy of C++ std::vector<(CvPoint)> class"""
     __swig_setmethods__ = {}
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvPointVector, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, CvPointVector, name)
     __repr__ = _swig_repr
-    def iterator(*args):
-        """iterator(self, PyObject PYTHON_SELF) -> PySwigIterator"""
-        return _cv.CvPointVector_iterator(*args)
+    def iterator(self):
+        """iterator(self) -> SwigPyIterator"""
+        return _cv.CvPointVector_iterator(self)
 
     def __iter__(self): return self.iterator()
-    def __nonzero__(*args):
+    def __nonzero__(self):
         """__nonzero__(self) -> bool"""
-        return _cv.CvPointVector___nonzero__(*args)
+        return _cv.CvPointVector___nonzero__(self)
+
+    def __bool__(self):
+        """__bool__(self) -> bool"""
+        return _cv.CvPointVector___bool__(self)
 
-    def __len__(*args):
+    def __len__(self):
         """__len__(self) -> size_type"""
-        return _cv.CvPointVector___len__(*args)
+        return _cv.CvPointVector___len__(self)
 
-    def pop(*args):
+    def pop(self):
         """pop(self) -> value_type"""
-        return _cv.CvPointVector_pop(*args)
+        return _cv.CvPointVector_pop(self)
 
-    def __getslice__(*args):
+    def __getslice__(self, *args):
         """__getslice__(self, difference_type i, difference_type j) -> CvPointVector"""
-        return _cv.CvPointVector___getslice__(*args)
+        return _cv.CvPointVector___getslice__(self, *args)
 
-    def __setslice__(*args):
+    def __setslice__(self, *args):
         """__setslice__(self, difference_type i, difference_type j, CvPointVector v)"""
-        return _cv.CvPointVector___setslice__(*args)
+        return _cv.CvPointVector___setslice__(self, *args)
 
-    def __delslice__(*args):
+    def __delslice__(self, *args):
         """__delslice__(self, difference_type i, difference_type j)"""
-        return _cv.CvPointVector___delslice__(*args)
+        return _cv.CvPointVector___delslice__(self, *args)
 
-    def __delitem__(*args):
-        """__delitem__(self, difference_type i)"""
-        return _cv.CvPointVector___delitem__(*args)
+    def __delitem__(self, *args):
+        """
+        __delitem__(self, difference_type i)
+        __delitem__(self, PySliceObject slice)
+        """
+        return _cv.CvPointVector___delitem__(self, *args)
 
-    def __getitem__(*args):
-        """__getitem__(self, difference_type i) -> value_type"""
-        return _cv.CvPointVector___getitem__(*args)
+    def __getitem__(self, *args):
+        """
+        __getitem__(self, PySliceObject slice) -> CvPointVector
+        __getitem__(self, difference_type i) -> value_type
+        """
+        return _cv.CvPointVector___getitem__(self, *args)
 
-    def __setitem__(*args):
-        """__setitem__(self, difference_type i, value_type x)"""
-        return _cv.CvPointVector___setitem__(*args)
+    def __setitem__(self, *args):
+        """
+        __setitem__(self, PySliceObject slice, CvPointVector v)
+        __setitem__(self, difference_type i, value_type x)
+        """
+        return _cv.CvPointVector___setitem__(self, *args)
 
-    def append(*args):
+    def append(self, *args):
         """append(self, value_type x)"""
-        return _cv.CvPointVector_append(*args)
+        return _cv.CvPointVector_append(self, *args)
 
-    def empty(*args):
+    def empty(self):
         """empty(self) -> bool"""
-        return _cv.CvPointVector_empty(*args)
+        return _cv.CvPointVector_empty(self)
 
-    def size(*args):
+    def size(self):
         """size(self) -> size_type"""
-        return _cv.CvPointVector_size(*args)
+        return _cv.CvPointVector_size(self)
 
-    def clear(*args):
+    def clear(self):
         """clear(self)"""
-        return _cv.CvPointVector_clear(*args)
+        return _cv.CvPointVector_clear(self)
 
-    def swap(*args):
+    def swap(self, *args):
         """swap(self, CvPointVector v)"""
-        return _cv.CvPointVector_swap(*args)
+        return _cv.CvPointVector_swap(self, *args)
 
-    def get_allocator(*args):
+    def get_allocator(self):
         """get_allocator(self) -> allocator_type"""
-        return _cv.CvPointVector_get_allocator(*args)
+        return _cv.CvPointVector_get_allocator(self)
 
-    def begin(*args):
+    def begin(self):
         """begin(self) -> const_iterator"""
-        return _cv.CvPointVector_begin(*args)
+        return _cv.CvPointVector_begin(self)
 
-    def end(*args):
+    def end(self):
         """end(self) -> const_iterator"""
-        return _cv.CvPointVector_end(*args)
+        return _cv.CvPointVector_end(self)
 
-    def rbegin(*args):
+    def rbegin(self):
         """rbegin(self) -> const_reverse_iterator"""
-        return _cv.CvPointVector_rbegin(*args)
+        return _cv.CvPointVector_rbegin(self)
 
-    def rend(*args):
+    def rend(self):
         """rend(self) -> const_reverse_iterator"""
-        return _cv.CvPointVector_rend(*args)
+        return _cv.CvPointVector_rend(self)
 
-    def pop_back(*args):
+    def pop_back(self):
         """pop_back(self)"""
-        return _cv.CvPointVector_pop_back(*args)
+        return _cv.CvPointVector_pop_back(self)
 
-    def erase(*args):
+    def erase(self, *args):
         """
         erase(self, iterator pos) -> iterator
         erase(self, iterator first, iterator last) -> iterator
         """
-        return _cv.CvPointVector_erase(*args)
+        return _cv.CvPointVector_erase(self, *args)
 
     def __init__(self, *args): 
         """
         __init__(self) -> CvPointVector
-        __init__(self, CvPointVector ?) -> CvPointVector
+        __init__(self, CvPointVector arg0) -> CvPointVector
         __init__(self, size_type size) -> CvPointVector
         __init__(self, size_type size, value_type value) -> CvPointVector
         """
         this = _cv.new_CvPointVector(*args)
         try: self.this.append(this)
         except: self.this = this
-    def push_back(*args):
+    def push_back(self, *args):
         """push_back(self, value_type x)"""
-        return _cv.CvPointVector_push_back(*args)
+        return _cv.CvPointVector_push_back(self, *args)
 
-    def front(*args):
+    def front(self):
         """front(self) -> value_type"""
-        return _cv.CvPointVector_front(*args)
+        return _cv.CvPointVector_front(self)
 
-    def back(*args):
+    def back(self):
         """back(self) -> value_type"""
-        return _cv.CvPointVector_back(*args)
+        return _cv.CvPointVector_back(self)
 
-    def assign(*args):
+    def assign(self, *args):
         """assign(self, size_type n, value_type x)"""
-        return _cv.CvPointVector_assign(*args)
+        return _cv.CvPointVector_assign(self, *args)
 
-    def resize(*args):
+    def resize(self, *args):
         """
         resize(self, size_type new_size)
         resize(self, size_type new_size, value_type x)
         """
-        return _cv.CvPointVector_resize(*args)
+        return _cv.CvPointVector_resize(self, *args)
 
-    def insert(*args):
+    def insert(self, *args):
         """
         insert(self, iterator pos, value_type x) -> iterator
         insert(self, iterator pos, size_type n, value_type x)
         """
-        return _cv.CvPointVector_insert(*args)
+        return _cv.CvPointVector_insert(self, *args)
 
-    def reserve(*args):
+    def reserve(self, *args):
         """reserve(self, size_type n)"""
-        return _cv.CvPointVector_reserve(*args)
+        return _cv.CvPointVector_reserve(self, *args)
 
-    def capacity(*args):
+    def capacity(self):
         """capacity(self) -> size_type"""
-        return _cv.CvPointVector_capacity(*args)
+        return _cv.CvPointVector_capacity(self)
 
     __swig_destroy__ = _cv.delete_CvPointVector
     __del__ = lambda self : None;
 CvPointVector_swigregister = _cv.CvPointVector_swigregister
 CvPointVector_swigregister(CvPointVector)
 
-def cvCalcHist(*args):
-	return cvCalcArrHist(*args)
-
 
 def cvSegmentMotion(*args):
   """
@@ -542,74 +587,30 @@ def cvHoughLines2( *args ):
 		return CvSeq_CvPoint_2.cast(seq)
 	return CvSeq_float_2.cast(seq)
 
+cvReleaseImage = _cv.delete_CvMat
 
-def cvReleaseImage(*args):
-  """cvReleaseImage(PyObject obj)"""
-  return _cv.cvReleaseImage(*args)
-
-def cvReleaseMat(*args):
-  """cvReleaseMat(PyObject obj)"""
-  return _cv.cvReleaseMat(*args)
+cvReleaseMat = _cv.delete_CvMat
 
-def cvReleaseStructuringElement(*args):
-  """cvReleaseStructuringElement(PyObject obj)"""
-  return _cv.cvReleaseStructuringElement(*args)
+cvReleaseStructuringElement = _cv.delete_IplConvKernel
 
-def cvReleaseConDensation(*args):
-  """cvReleaseConDensation(PyObject obj)"""
-  return _cv.cvReleaseConDensation(*args)
-
-def cvReleaseKalman(*args):
-  """cvReleaseKalman(PyObject obj)"""
-  return _cv.cvReleaseKalman(*args)
-
-def cvReleaseHist(*args):
-  """cvReleaseHist(PyObject obj)"""
-  return _cv.cvReleaseHist(*args)
-
-def cvReleaseHaarClassifierCascade(*args):
-  """cvReleaseHaarClassifierCascade(PyObject obj)"""
-  return _cv.cvReleaseHaarClassifierCascade(*args)
-
-def cvReleasePOSITObject(*args):
-  """cvReleasePOSITObject(PyObject obj)"""
-  return _cv.cvReleasePOSITObject(*args)
+cvReleaseConDensation = _cv.delete_CvConDensation
 
-def cvReleaseImageHeader(*args):
-  """cvReleaseImageHeader(PyObject obj)"""
-  return _cv.cvReleaseImageHeader(*args)
+cvReleaseKalman = _cv.delete_CvKalman
 
-def cvReleaseMatND(*args):
-  """cvReleaseMatND(PyObject obj)"""
-  return _cv.cvReleaseMatND(*args)
+cvReleaseHist = _cv.delete_CvHistogram
 
-def cvReleaseSparseMat(*args):
-  """cvReleaseSparseMat(PyObject obj)"""
-  return _cv.cvReleaseSparseMat(*args)
+cvReleaseHaarClassifierCascade = _cv.delete_CvHaarClassifierCascade
 
-def cvReleaseMemStorage(*args):
-  """cvReleaseMemStorage(PyObject obj)"""
-  return _cv.cvReleaseMemStorage(*args)
+cvReleaseImageHeader = _cv.delete_CvMat
 
-def cvReleaseGraphScanner(*args):
-  """cvReleaseGraphScanner(PyObject obj)"""
-  return _cv.cvReleaseGraphScanner(*args)
+cvReleaseMatND = _cv.delete_CvMatND
 
-def cvReleaseFileStorage(*args):
-  """cvReleaseFileStorage(PyObject obj)"""
-  return _cv.cvReleaseFileStorage(*args)
+cvReleaseSparseMat = _cv.delete_CvSparseMat
 
-def cvRelease(*args):
-  """cvRelease(PyObject obj)"""
-  return _cv.cvRelease(*args)
+cvReleaseMemStorage = _cv.delete_CvMemStorage
 
-def cvReleaseCapture(*args):
-  """cvReleaseCapture(PyObject obj)"""
-  return _cv.cvReleaseCapture(*args)
+cvReleaseGraphScanner = _cv.delete_CvGraphScanner
 
-def cvReleaseVideoWriter(*args):
-  """cvReleaseVideoWriter(PyObject obj)"""
-  return _cv.cvReleaseVideoWriter(*args)
 
 def cvFree(*args):
   """cvFree(void ptr)"""
@@ -679,6 +680,10 @@ def CV_IS_IMAGE(*args):
   """CV_IS_IMAGE(CvArr img) -> int"""
   return _cv.CV_IS_IMAGE(*args)
 
+def CV_MAT_DEPTH(*args):
+  """CV_MAT_DEPTH(int flags) -> int"""
+  return _cv.CV_MAT_DEPTH(*args)
+
 def CV_MAKETYPE(*args):
   """CV_MAKETYPE(int depth, int cn) -> int"""
   return _cv.CV_MAKETYPE(*args)
@@ -715,10 +720,6 @@ def CV_MAT_CN(*args):
   """CV_MAT_CN(int flags) -> int"""
   return _cv.CV_MAT_CN(*args)
 
-def CV_MAT_DEPTH(*args):
-  """CV_MAT_DEPTH(int flags) -> int"""
-  return _cv.CV_MAT_DEPTH(*args)
-
 def CV_MAT_TYPE(*args):
   """CV_MAT_TYPE(int flags) -> int"""
   return _cv.CV_MAT_TYPE(*args)
@@ -984,10 +985,7 @@ def CV_NODE_SEQ_IS_SIMPLE(*args):
   return _cv.CV_NODE_SEQ_IS_SIMPLE(*args)
 
 def cvReshapeND(*args):
-  """
-    cvReshapeND(CvArr arr, CvMat header, int new_cn, int new_dims, 
-        int new_sizes)
-    """
+  """cvReshapeND(CvArr arr, int new_cn, int new_dims, int new_sizes)"""
   return _cv.cvReshapeND(*args)
 
 def cvConvert(*args):
@@ -1054,6 +1052,10 @@ def CV_IS_HAAR_CLASSIFIER(*args):
   """CV_IS_HAAR_CLASSIFIER(void haar) -> int"""
   return _cv.CV_IS_HAAR_CLASSIFIER(*args)
 
+def cvContourPerimeter(*args):
+  """cvContourPerimeter(CvSeq contour) -> double"""
+  return _cv.cvContourPerimeter(*args)
+
 def cvCalcBackProject(*args):
   """cvCalcBackProject( image, CvArr dst, CvHistogram hist)"""
   return _cv.cvCalcBackProject(*args)
@@ -1090,6 +1092,10 @@ CV_CHECK_RANGE = _cv.CV_CHECK_RANGE
 CV_CHECK_QUIET = _cv.CV_CHECK_QUIET
 CV_RAND_UNI = _cv.CV_RAND_UNI
 CV_RAND_NORMAL = _cv.CV_RAND_NORMAL
+CV_SORT_EVERY_ROW = _cv.CV_SORT_EVERY_ROW
+CV_SORT_EVERY_COLUMN = _cv.CV_SORT_EVERY_COLUMN
+CV_SORT_ASCENDING = _cv.CV_SORT_ASCENDING
+CV_SORT_DESCENDING = _cv.CV_SORT_DESCENDING
 CV_GEMM_A_T = _cv.CV_GEMM_A_T
 CV_GEMM_B_T = _cv.CV_GEMM_B_T
 CV_GEMM_C_T = _cv.CV_GEMM_C_T
@@ -1099,6 +1105,9 @@ CV_SVD_V_T = _cv.CV_SVD_V_T
 CV_LU = _cv.CV_LU
 CV_SVD = _cv.CV_SVD
 CV_SVD_SYM = _cv.CV_SVD_SYM
+CV_CHOLESKY = _cv.CV_CHOLESKY
+CV_QR = _cv.CV_QR
+CV_NORMAL = _cv.CV_NORMAL
 CV_COVAR_SCRAMBLED = _cv.CV_COVAR_SCRAMBLED
 CV_COVAR_NORMAL = _cv.CV_COVAR_NORMAL
 CV_COVAR_USE_AVG = _cv.CV_COVAR_USE_AVG
@@ -1159,13 +1168,13 @@ CV_FONT_HERSHEY_SCRIPT_SIMPLEX = _cv.CV_FONT_HERSHEY_SCRIPT_SIMPLEX
 CV_FONT_HERSHEY_SCRIPT_COMPLEX = _cv.CV_FONT_HERSHEY_SCRIPT_COMPLEX
 CV_FONT_ITALIC = _cv.CV_FONT_ITALIC
 CV_FONT_VECTOR0 = _cv.CV_FONT_VECTOR0
+CV_KMEANS_USE_INITIAL_LABELS = _cv.CV_KMEANS_USE_INITIAL_LABELS
 CV_ErrModeLeaf = _cv.CV_ErrModeLeaf
 CV_ErrModeParent = _cv.CV_ErrModeParent
 CV_ErrModeSilent = _cv.CV_ErrModeSilent
 CV_MAJOR_VERSION = _cv.CV_MAJOR_VERSION
 CV_MINOR_VERSION = _cv.CV_MINOR_VERSION
 CV_SUBMINOR_VERSION = _cv.CV_SUBMINOR_VERSION
-CV_VERSION = _cv.CV_VERSION
 CV_PI = _cv.CV_PI
 CV_LOG2 = _cv.CV_LOG2
 IPL_DEPTH_SIGN = _cv.IPL_DEPTH_SIGN
@@ -1207,6 +1216,7 @@ CV_32S = _cv.CV_32S
 CV_32F = _cv.CV_32F
 CV_64F = _cv.CV_64F
 CV_USRTYPE1 = _cv.CV_USRTYPE1
+CV_MAT_DEPTH_MASK = _cv.CV_MAT_DEPTH_MASK
 CV_8UC1 = _cv.CV_8UC1
 CV_8UC2 = _cv.CV_8UC2
 CV_8UC3 = _cv.CV_8UC3
@@ -1237,7 +1247,6 @@ CV_64FC3 = _cv.CV_64FC3
 CV_64FC4 = _cv.CV_64FC4
 CV_AUTO_STEP = _cv.CV_AUTO_STEP
 CV_MAT_CN_MASK = _cv.CV_MAT_CN_MASK
-CV_MAT_DEPTH_MASK = _cv.CV_MAT_DEPTH_MASK
 CV_MAT_TYPE_MASK = _cv.CV_MAT_TYPE_MASK
 CV_MAT_CONT_FLAG_SHIFT = _cv.CV_MAT_CONT_FLAG_SHIFT
 CV_MAT_CONT_FLAG = _cv.CV_MAT_CONT_FLAG
@@ -1376,6 +1385,7 @@ CV_StsOutOfRange = _cv.CV_StsOutOfRange
 CV_StsParseError = _cv.CV_StsParseError
 CV_StsNotImplemented = _cv.CV_StsNotImplemented
 CV_StsBadMemBlock = _cv.CV_StsBadMemBlock
+CV_StsAssert = _cv.CV_StsAssert
 CV_BLUR_NO_SCALE = _cv.CV_BLUR_NO_SCALE
 CV_BLUR = _cv.CV_BLUR
 CV_GAUSSIAN = _cv.CV_GAUSSIAN
@@ -1520,19 +1530,32 @@ CV_HAAR_DO_CANNY_PRUNING = _cv.CV_HAAR_DO_CANNY_PRUNING
 CV_HAAR_SCALE_IMAGE = _cv.CV_HAAR_SCALE_IMAGE
 CV_HAAR_FIND_BIGGEST_OBJECT = _cv.CV_HAAR_FIND_BIGGEST_OBJECT
 CV_HAAR_DO_ROUGH_SEARCH = _cv.CV_HAAR_DO_ROUGH_SEARCH
+CV_LMEDS = _cv.CV_LMEDS
+CV_RANSAC = _cv.CV_RANSAC
+CV_CALIB_CB_ADAPTIVE_THRESH = _cv.CV_CALIB_CB_ADAPTIVE_THRESH
+CV_CALIB_CB_NORMALIZE_IMAGE = _cv.CV_CALIB_CB_NORMALIZE_IMAGE
+CV_CALIB_CB_FILTER_QUADS = _cv.CV_CALIB_CB_FILTER_QUADS
 CV_CALIB_USE_INTRINSIC_GUESS = _cv.CV_CALIB_USE_INTRINSIC_GUESS
 CV_CALIB_FIX_ASPECT_RATIO = _cv.CV_CALIB_FIX_ASPECT_RATIO
 CV_CALIB_FIX_PRINCIPAL_POINT = _cv.CV_CALIB_FIX_PRINCIPAL_POINT
 CV_CALIB_ZERO_TANGENT_DIST = _cv.CV_CALIB_ZERO_TANGENT_DIST
-CV_CALIB_CB_ADAPTIVE_THRESH = _cv.CV_CALIB_CB_ADAPTIVE_THRESH
-CV_CALIB_CB_NORMALIZE_IMAGE = _cv.CV_CALIB_CB_NORMALIZE_IMAGE
-CV_CALIB_CB_FILTER_QUADS = _cv.CV_CALIB_CB_FILTER_QUADS
+CV_CALIB_FIX_FOCAL_LENGTH = _cv.CV_CALIB_FIX_FOCAL_LENGTH
+CV_CALIB_FIX_K1 = _cv.CV_CALIB_FIX_K1
+CV_CALIB_FIX_K2 = _cv.CV_CALIB_FIX_K2
+CV_CALIB_FIX_K3 = _cv.CV_CALIB_FIX_K3
+CV_CALIB_FIX_INTRINSIC = _cv.CV_CALIB_FIX_INTRINSIC
+CV_CALIB_SAME_FOCAL_LENGTH = _cv.CV_CALIB_SAME_FOCAL_LENGTH
+CV_CALIB_ZERO_DISPARITY = _cv.CV_CALIB_ZERO_DISPARITY
 CV_FM_7POINT = _cv.CV_FM_7POINT
 CV_FM_8POINT = _cv.CV_FM_8POINT
 CV_FM_LMEDS_ONLY = _cv.CV_FM_LMEDS_ONLY
 CV_FM_RANSAC_ONLY = _cv.CV_FM_RANSAC_ONLY
 CV_FM_LMEDS = _cv.CV_FM_LMEDS
 CV_FM_RANSAC = _cv.CV_FM_RANSAC
+CV_STEREO_BM_NORMALIZED_RESPONSE = _cv.CV_STEREO_BM_NORMALIZED_RESPONSE
+CV_STEREO_BM_BASIC = _cv.CV_STEREO_BM_BASIC
+CV_STEREO_BM_FISH_EYE = _cv.CV_STEREO_BM_FISH_EYE
+CV_STEREO_BM_NARROW = _cv.CV_STEREO_BM_NARROW
 CV_RETR_EXTERNAL = _cv.CV_RETR_EXTERNAL
 CV_RETR_LIST = _cv.CV_RETR_LIST
 CV_RETR_CCOMP = _cv.CV_RETR_CCOMP
@@ -1571,9 +1594,9 @@ class Cv32suf(_object):
     __swig_setmethods__["f"] = _cv.Cv32suf_f_set
     __swig_getmethods__["f"] = _cv.Cv32suf_f_get
     if _newclass:f = _swig_property(_cv.Cv32suf_f_get, _cv.Cv32suf_f_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> Cv32suf"""
-        this = _cv.new_Cv32suf(*args)
+        this = _cv.new_Cv32suf()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_Cv32suf
@@ -1583,41 +1606,23 @@ Cv32suf_swigregister(Cv32suf)
 
 def cvCvtSeqToArray(*args):
   """
-    cvCvtSeqToArray(CvSeq seq, CvArr elements, CvSlice slice=CV_WHOLE_SEQ) -> CvArr
+    cvCvtSeqToArray(CvSeq seq, CvArr elements, CvSlice slice = CV_WHOLE_SEQ) -> CvArr
     cvCvtSeqToArray(CvSeq seq, CvArr elements) -> CvArr
     """
   return _cv.cvCvtSeqToArray(*args)
 
-def cvArcLength(*args):
-  """
-    cvArcLength(CvSeq seq, CvSlice slice=CV_WHOLE_SEQ, int is_closed=-1) -> double
-    cvArcLength(CvSeq seq, CvSlice slice=CV_WHOLE_SEQ) -> double
-    cvArcLength(CvSeq seq) -> double
-    cvArcLength(CvArr arr, CvSlice slice=CV_WHOLE_SEQ, int is_closed=-1) -> double
-    cvArcLength(CvArr arr, CvSlice slice=CV_WHOLE_SEQ) -> double
-    cvArcLength(CvArr arr) -> double
-    """
-  return _cv.cvArcLength(*args)
-
-def cvContourPerimeter(*args):
-  """
-    cvContourPerimeter(CvSeq seq) -> double
-    cvContourPerimeter(CvArr arr) -> double
-    """
-  return _cv.cvContourPerimeter(*args)
-
 def cvHaarDetectObjects(*args):
   """
     cvHaarDetectObjects(CvArr image, CvHaarClassifierCascade cascade, CvMemStorage storage, 
-        double scale_factor=1.1, int min_neighbors=3, 
-        int flags=0, CvSize min_size=cvSize(0,0)) -> CvSeq_CvRect
+        double scale_factor = 1.1, int min_neighbors = 3, 
+        int flags = 0, CvSize min_size = cvSize(0,0)) -> CvSeq_CvRect
     cvHaarDetectObjects(CvArr image, CvHaarClassifierCascade cascade, CvMemStorage storage, 
-        double scale_factor=1.1, int min_neighbors=3, 
-        int flags=0) -> CvSeq_CvRect
+        double scale_factor = 1.1, int min_neighbors = 3, 
+        int flags = 0) -> CvSeq_CvRect
     cvHaarDetectObjects(CvArr image, CvHaarClassifierCascade cascade, CvMemStorage storage, 
-        double scale_factor=1.1, int min_neighbors=3) -> CvSeq_CvRect
+        double scale_factor = 1.1, int min_neighbors = 3) -> CvSeq_CvRect
     cvHaarDetectObjects(CvArr image, CvHaarClassifierCascade cascade, CvMemStorage storage, 
-        double scale_factor=1.1) -> CvSeq_CvRect
+        double scale_factor = 1.1) -> CvSeq_CvRect
     cvHaarDetectObjects(CvArr image, CvHaarClassifierCascade cascade, CvMemStorage storage) -> CvSeq_CvRect
     """
   return _cv.cvHaarDetectObjects(*args)
@@ -1625,7 +1630,7 @@ def cvHaarDetectObjects(*args):
 def cvApproxPoly(*args):
   """
     cvApproxPoly(void src_seq, int header_size, CvMemStorage storage, 
-        int method, double parameter, int parameter2=0) -> CvSeq_CvPoint
+        int method, double parameter, int parameter2 = 0) -> CvSeq_CvPoint
     cvApproxPoly(void src_seq, int header_size, CvMemStorage storage, 
         int method, double parameter) -> CvSeq_CvPoint
     """
@@ -1633,8 +1638,8 @@ def cvApproxPoly(*args):
 
 def cvConvexHull2(*args):
   """
-    cvConvexHull2(CvArr points, int orientation=CV_CLOCKWISE, int return_points=0) -> CvMat
-    cvConvexHull2(CvArr points, int orientation=CV_CLOCKWISE) -> CvMat
+    cvConvexHull2(CvArr points, int orientation = CV_CLOCKWISE, int return_points = 0) -> CvMat
+    cvConvexHull2(CvArr points, int orientation = CV_CLOCKWISE) -> CvMat
     cvConvexHull2(CvArr points) -> CvMat
     """
   return _cv.cvConvexHull2(*args)
@@ -1643,14 +1648,12 @@ def cvSnakeImage(*args):
   """
     cvSnakeImage(CvMat image, CvPointVector points, FloatVector alpha, 
         FloatVector beta, FloatVector gamma, CvSize win, 
-        CvTermCriteria criteria, int calc_gradient=1) -> CvPointVector
+        CvTermCriteria criteria, int calc_gradient = 1) -> CvPointVector
     cvSnakeImage(CvMat image, CvPointVector points, FloatVector alpha, 
         FloatVector beta, FloatVector gamma, CvSize win, 
         CvTermCriteria criteria) -> CvPointVector
     """
   return _cv.cvSnakeImage(*args)
-cvar = _cv.cvar
-icvDepthToType = cvar.icvDepthToType
 
 class Cv64suf(_object):
     """Proxy of C++ Cv64suf class"""
@@ -1668,9 +1671,9 @@ class Cv64suf(_object):
     __swig_setmethods__["f"] = _cv.Cv64suf_f_set
     __swig_getmethods__["f"] = _cv.Cv64suf_f_get
     if _newclass:f = _swig_property(_cv.Cv64suf_f_get, _cv.Cv64suf_f_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> Cv64suf"""
-        this = _cv.new_Cv64suf(*args)
+        this = _cv.new_Cv64suf()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_Cv64suf
@@ -1712,7 +1715,7 @@ class IplImage(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, IplImage, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, IplImage, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     __swig_setmethods__["ID"] = _cv.IplImage_ID_set
     __swig_getmethods__["ID"] = _cv.IplImage_ID_get
@@ -1749,227 +1752,227 @@ class IplImage(_object):
     if _newclass:widthStep = _swig_property(_cv.IplImage_widthStep_get, _cv.IplImage_widthStep_set)
     __swig_destroy__ = _cv.delete_IplImage
     __del__ = lambda self : None;
-    def __add__(*args):
+    def __add__(self, *args):
         """
         __add__(self, CvArr src)
         __add__(self, CvScalar val)
         """
-        return _cv.IplImage___add__(*args)
+        return _cv.IplImage___add__(self, *args)
 
-    def __iadd__(*args):
+    def __iadd__(self, *args):
         """
         __iadd__(self, CvArr src)
         __iadd__(self, CvScalar val)
         """
-        return _cv.IplImage___iadd__(*args)
+        return _cv.IplImage___iadd__(self, *args)
 
-    def __xor__(*args):
+    def __xor__(self, *args):
         """
         __xor__(self, CvArr src)
         __xor__(self, CvScalar val)
         """
-        return _cv.IplImage___xor__(*args)
+        return _cv.IplImage___xor__(self, *args)
 
-    def __ixor__(*args):
+    def __ixor__(self, *args):
         """
         __ixor__(self, CvArr src)
         __ixor__(self, CvScalar val)
         """
-        return _cv.IplImage___ixor__(*args)
+        return _cv.IplImage___ixor__(self, *args)
 
-    def __sub__(*args):
+    def __sub__(self, *args):
         """
         __sub__(self, CvArr src)
         __sub__(self, CvScalar val)
         """
-        return _cv.IplImage___sub__(*args)
+        return _cv.IplImage___sub__(self, *args)
 
-    def __isub__(*args):
+    def __isub__(self, *args):
         """
         __isub__(self, CvArr src)
         __isub__(self, CvScalar val)
         """
-        return _cv.IplImage___isub__(*args)
+        return _cv.IplImage___isub__(self, *args)
 
-    def __or__(*args):
+    def __or__(self, *args):
         """
         __or__(self, CvArr src)
         __or__(self, CvScalar val)
         """
-        return _cv.IplImage___or__(*args)
+        return _cv.IplImage___or__(self, *args)
 
-    def __ior__(*args):
+    def __ior__(self, *args):
         """
         __ior__(self, CvArr src)
         __ior__(self, CvScalar val)
         """
-        return _cv.IplImage___ior__(*args)
+        return _cv.IplImage___ior__(self, *args)
 
-    def __and__(*args):
+    def __and__(self, *args):
         """
         __and__(self, CvArr src)
         __and__(self, CvScalar val)
         """
-        return _cv.IplImage___and__(*args)
+        return _cv.IplImage___and__(self, *args)
 
-    def __iand__(*args):
+    def __iand__(self, *args):
         """
         __iand__(self, CvArr src)
         __iand__(self, CvScalar val)
         """
-        return _cv.IplImage___iand__(*args)
+        return _cv.IplImage___iand__(self, *args)
 
-    def __ge__(*args):
+    def __ge__(self, *args):
         """
         __ge__(self, CvArr src)
         __ge__(self, double val)
         """
-        return _cv.IplImage___ge__(*args)
+        return _cv.IplImage___ge__(self, *args)
 
-    def __eq__(*args):
+    def __eq__(self, *args):
         """
         __eq__(self, CvArr src)
         __eq__(self, double val)
         """
-        return _cv.IplImage___eq__(*args)
+        return _cv.IplImage___eq__(self, *args)
 
-    def __le__(*args):
+    def __le__(self, *args):
         """
         __le__(self, CvArr src)
         __le__(self, double val)
         """
-        return _cv.IplImage___le__(*args)
+        return _cv.IplImage___le__(self, *args)
 
-    def __ne__(*args):
+    def __ne__(self, *args):
         """
         __ne__(self, CvArr src)
         __ne__(self, double val)
         """
-        return _cv.IplImage___ne__(*args)
+        return _cv.IplImage___ne__(self, *args)
 
-    def __lt__(*args):
+    def __lt__(self, *args):
         """
         __lt__(self, CvArr src)
         __lt__(self, double val)
         """
-        return _cv.IplImage___lt__(*args)
+        return _cv.IplImage___lt__(self, *args)
 
-    def __gt__(*args):
+    def __gt__(self, *args):
         """
         __gt__(self, CvArr src)
         __gt__(self, double val)
         """
-        return _cv.IplImage___gt__(*args)
+        return _cv.IplImage___gt__(self, *args)
 
-    def __mul__(*args):
+    def __mul__(self, *args):
         """
         __mul__(self, CvArr src)
         __mul__(self, double val)
         """
-        return _cv.IplImage___mul__(*args)
+        return _cv.IplImage___mul__(self, *args)
 
-    def __imul__(*args):
+    def __imul__(self, *args):
         """
         __imul__(self, CvArr src)
         __imul__(self, double val)
         """
-        return _cv.IplImage___imul__(*args)
+        return _cv.IplImage___imul__(self, *args)
 
-    def __div__(*args):
+    def __div__(self, *args):
         """
         __div__(self, CvArr src)
         __div__(self, double val)
         """
-        return _cv.IplImage___div__(*args)
+        return _cv.IplImage___div__(self, *args)
 
-    def __idiv__(*args):
+    def __idiv__(self, *args):
         """
         __idiv__(self, CvArr src)
         __idiv__(self, double val)
         """
-        return _cv.IplImage___idiv__(*args)
+        return _cv.IplImage___idiv__(self, *args)
 
-    def __rdiv__(*args):
+    def __rdiv__(self, *args):
         """__rdiv__(self, CvArr arg)"""
-        return _cv.IplImage___rdiv__(*args)
+        return _cv.IplImage___rdiv__(self, *args)
 
-    def __radd__(*args):
+    def __radd__(self, *args):
         """
         __radd__(self, CvArr arg)
         __radd__(self, CvScalar arg)
         __radd__(self, double arg)
         """
-        return _cv.IplImage___radd__(*args)
+        return _cv.IplImage___radd__(self, *args)
 
-    def __rsub__(*args):
+    def __rsub__(self, *args):
         """
         __rsub__(self, CvArr arg)
         __rsub__(self, CvScalar arg)
         __rsub__(self, double arg)
         """
-        return _cv.IplImage___rsub__(*args)
+        return _cv.IplImage___rsub__(self, *args)
 
-    def __rmul__(*args):
+    def __rmul__(self, *args):
         """
         __rmul__(self, CvArr arg)
         __rmul__(self, double arg)
         """
-        return _cv.IplImage___rmul__(*args)
+        return _cv.IplImage___rmul__(self, *args)
 
-    def __ror__(*args):
+    def __ror__(self, *args):
         """
         __ror__(self, CvScalar arg)
         __ror__(self, double arg)
         """
-        return _cv.IplImage___ror__(*args)
+        return _cv.IplImage___ror__(self, *args)
 
-    def __rand__(*args):
+    def __rand__(self, *args):
         """
         __rand__(self, CvScalar arg)
         __rand__(self, double arg)
         """
-        return _cv.IplImage___rand__(*args)
+        return _cv.IplImage___rand__(self, *args)
 
-    def __rxor__(*args):
+    def __rxor__(self, *args):
         """
         __rxor__(self, CvScalar arg)
         __rxor__(self, double arg)
         """
-        return _cv.IplImage___rxor__(*args)
+        return _cv.IplImage___rxor__(self, *args)
 
-    def __req__(*args):
+    def __req__(self, *args):
         """__req__(self, double arg)"""
-        return _cv.IplImage___req__(*args)
+        return _cv.IplImage___req__(self, *args)
 
-    def __rgt__(*args):
+    def __rgt__(self, *args):
         """__rgt__(self, double arg)"""
-        return _cv.IplImage___rgt__(*args)
+        return _cv.IplImage___rgt__(self, *args)
 
-    def __rge__(*args):
+    def __rge__(self, *args):
         """__rge__(self, double arg)"""
-        return _cv.IplImage___rge__(*args)
+        return _cv.IplImage___rge__(self, *args)
 
-    def __rlt__(*args):
+    def __rlt__(self, *args):
         """__rlt__(self, double arg)"""
-        return _cv.IplImage___rlt__(*args)
+        return _cv.IplImage___rlt__(self, *args)
 
-    def __rle__(*args):
+    def __rle__(self, *args):
         """__rle__(self, double arg)"""
-        return _cv.IplImage___rle__(*args)
+        return _cv.IplImage___rle__(self, *args)
 
-    def __rne__(*args):
+    def __rne__(self, *args):
         """__rne__(self, double arg)"""
-        return _cv.IplImage___rne__(*args)
+        return _cv.IplImage___rne__(self, *args)
 
-    def __pow__(*args):
+    def __pow__(self, *args):
         """__pow__(self, double arg)"""
-        return _cv.IplImage___pow__(*args)
+        return _cv.IplImage___pow__(self, *args)
 
-    def __str__(*args):
+    def __str__(self):
         """__str__(self) -> char"""
-        return _cv.IplImage___str__(*args)
+        return _cv.IplImage___str__(self)
 
-    def __setitem__(*args):
+    def __setitem__(self, *args):
         """
         __setitem__(self, PyObject object, double val)
         __setitem__(self, PyObject object, CvPoint val)
@@ -1977,18 +1980,18 @@ class IplImage(_object):
         __setitem__(self, PyObject object, CvScalar val)
         __setitem__(self, PyObject object, CvArr arr)
         """
-        return _cv.IplImage___setitem__(*args)
+        return _cv.IplImage___setitem__(self, *args)
 
-    def __getitem__(*args):
+    def __getitem__(self, *args):
         """__getitem__(self, PyObject object) -> PyObject"""
-        return _cv.IplImage___getitem__(*args)
+        return _cv.IplImage___getitem__(self, *args)
 
 IplImage_swigregister = _cv.IplImage_swigregister
 IplImage_swigregister(IplImage)
 
 def cvRNG(*args):
   """
-    cvRNG(int64 seed=-1) -> CvRNG
+    cvRNG(int64 seed = -1) -> CvRNG
     cvRNG() -> CvRNG
     """
   return _cv.cvRNG(*args)
@@ -2015,9 +2018,9 @@ class IplROI(_object):
     __swig_setmethods__["height"] = _cv.IplROI_height_set
     __swig_getmethods__["height"] = _cv.IplROI_height_get
     if _newclass:height = _swig_property(_cv.IplROI_height_get, _cv.IplROI_height_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> IplROI"""
-        this = _cv.new_IplROI(*args)
+        this = _cv.new_IplROI()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_IplROI
@@ -2031,7 +2034,7 @@ class IplConvKernel(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, IplConvKernel, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, IplConvKernel, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     __swig_setmethods__["nCols"] = _cv.IplConvKernel_nCols_set
     __swig_getmethods__["nCols"] = _cv.IplConvKernel_nCols_get
@@ -2078,9 +2081,9 @@ class IplConvKernelFP(_object):
     __swig_setmethods__["values"] = _cv.IplConvKernelFP_values_set
     __swig_getmethods__["values"] = _cv.IplConvKernelFP_values_get
     if _newclass:values = _swig_property(_cv.IplConvKernelFP_values_get, _cv.IplConvKernelFP_values_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> IplConvKernelFP"""
-        this = _cv.new_IplConvKernelFP(*args)
+        this = _cv.new_IplConvKernelFP()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_IplConvKernelFP
@@ -2094,7 +2097,7 @@ class CvMat(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvMat, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, CvMat, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     __swig_setmethods__["type"] = _cv.CvMat_type_set
     __swig_getmethods__["type"] = _cv.CvMat_type_get
@@ -2112,250 +2115,260 @@ class CvMat(_object):
     if _newclass:data = _swig_property(_cv.CvMat_data_get)
     __swig_destroy__ = _cv.delete_CvMat
     __del__ = lambda self : None;
+    __swig_setmethods__["depth"] = _cv.CvMat_depth_set
     __swig_getmethods__["depth"] = _cv.CvMat_depth_get
-    if _newclass:depth = _swig_property(_cv.CvMat_depth_get)
+    if _newclass:depth = _swig_property(_cv.CvMat_depth_get, _cv.CvMat_depth_set)
+    __swig_setmethods__["nChannels"] = _cv.CvMat_nChannels_set
     __swig_getmethods__["nChannels"] = _cv.CvMat_nChannels_get
-    if _newclass:nChannels = _swig_property(_cv.CvMat_nChannels_get)
+    if _newclass:nChannels = _swig_property(_cv.CvMat_nChannels_get, _cv.CvMat_nChannels_set)
+    __swig_setmethods__["dataOrder"] = _cv.CvMat_dataOrder_set
     __swig_getmethods__["dataOrder"] = _cv.CvMat_dataOrder_get
-    if _newclass:dataOrder = _swig_property(_cv.CvMat_dataOrder_get)
+    if _newclass:dataOrder = _swig_property(_cv.CvMat_dataOrder_get, _cv.CvMat_dataOrder_set)
+    __swig_setmethods__["origin"] = _cv.CvMat_origin_set
     __swig_getmethods__["origin"] = _cv.CvMat_origin_get
-    if _newclass:origin = _swig_property(_cv.CvMat_origin_get)
+    if _newclass:origin = _swig_property(_cv.CvMat_origin_get, _cv.CvMat_origin_set)
+    __swig_setmethods__["width"] = _cv.CvMat_width_set
     __swig_getmethods__["width"] = _cv.CvMat_width_get
-    if _newclass:width = _swig_property(_cv.CvMat_width_get)
+    if _newclass:width = _swig_property(_cv.CvMat_width_get, _cv.CvMat_width_set)
+    __swig_setmethods__["height"] = _cv.CvMat_height_set
     __swig_getmethods__["height"] = _cv.CvMat_height_get
-    if _newclass:height = _swig_property(_cv.CvMat_height_get)
+    if _newclass:height = _swig_property(_cv.CvMat_height_get, _cv.CvMat_height_set)
+    __swig_setmethods__["imageSize"] = _cv.CvMat_imageSize_set
     __swig_getmethods__["imageSize"] = _cv.CvMat_imageSize_get
-    if _newclass:imageSize = _swig_property(_cv.CvMat_imageSize_get)
+    if _newclass:imageSize = _swig_property(_cv.CvMat_imageSize_get, _cv.CvMat_imageSize_set)
+    __swig_setmethods__["widthStep"] = _cv.CvMat_widthStep_set
     __swig_getmethods__["widthStep"] = _cv.CvMat_widthStep_get
-    if _newclass:widthStep = _swig_property(_cv.CvMat_widthStep_get)
+    if _newclass:widthStep = _swig_property(_cv.CvMat_widthStep_get, _cv.CvMat_widthStep_set)
+    __swig_setmethods__["rows"] = _cv.CvMat_rows_set
     __swig_getmethods__["rows"] = _cv.CvMat_rows_get
-    if _newclass:rows = _swig_property(_cv.CvMat_rows_get)
+    if _newclass:rows = _swig_property(_cv.CvMat_rows_get, _cv.CvMat_rows_set)
+    __swig_setmethods__["cols"] = _cv.CvMat_cols_set
     __swig_getmethods__["cols"] = _cv.CvMat_cols_get
-    if _newclass:cols = _swig_property(_cv.CvMat_cols_get)
-    def __add__(*args):
+    if _newclass:cols = _swig_property(_cv.CvMat_cols_get, _cv.CvMat_cols_set)
+    def __add__(self, *args):
         """
         __add__(self, CvArr src) -> CvMat
         __add__(self, CvScalar val) -> CvMat
         """
-        return _cv.CvMat___add__(*args)
+        return _cv.CvMat___add__(self, *args)
 
-    def __iadd__(*args):
+    def __iadd__(self, *args):
         """
         __iadd__(self, CvArr src) -> CvMat
         __iadd__(self, CvScalar val) -> CvMat
         """
-        return _cv.CvMat___iadd__(*args)
+        return _cv.CvMat___iadd__(self, *args)
 
-    def __xor__(*args):
+    def __xor__(self, *args):
         """
         __xor__(self, CvArr src) -> CvMat
         __xor__(self, CvScalar val) -> CvMat
         """
-        return _cv.CvMat___xor__(*args)
+        return _cv.CvMat___xor__(self, *args)
 
-    def __ixor__(*args):
+    def __ixor__(self, *args):
         """
         __ixor__(self, CvArr src) -> CvMat
         __ixor__(self, CvScalar val) -> CvMat
         """
-        return _cv.CvMat___ixor__(*args)
+        return _cv.CvMat___ixor__(self, *args)
 
-    def __sub__(*args):
+    def __sub__(self, *args):
         """
         __sub__(self, CvArr src) -> CvMat
         __sub__(self, CvScalar val) -> CvMat
         """
-        return _cv.CvMat___sub__(*args)
+        return _cv.CvMat___sub__(self, *args)
 
-    def __isub__(*args):
+    def __isub__(self, *args):
         """
         __isub__(self, CvArr src) -> CvMat
         __isub__(self, CvScalar val) -> CvMat
         """
-        return _cv.CvMat___isub__(*args)
+        return _cv.CvMat___isub__(self, *args)
 
-    def __or__(*args):
+    def __or__(self, *args):
         """
         __or__(self, CvArr src) -> CvMat
         __or__(self, CvScalar val) -> CvMat
         """
-        return _cv.CvMat___or__(*args)
+        return _cv.CvMat___or__(self, *args)
 
-    def __ior__(*args):
+    def __ior__(self, *args):
         """
         __ior__(self, CvArr src) -> CvMat
         __ior__(self, CvScalar val) -> CvMat
         """
-        return _cv.CvMat___ior__(*args)
+        return _cv.CvMat___ior__(self, *args)
 
-    def __and__(*args):
+    def __and__(self, *args):
         """
         __and__(self, CvArr src) -> CvMat
         __and__(self, CvScalar val) -> CvMat
         """
-        return _cv.CvMat___and__(*args)
+        return _cv.CvMat___and__(self, *args)
 
-    def __iand__(*args):
+    def __iand__(self, *args):
         """
         __iand__(self, CvArr src) -> CvMat
         __iand__(self, CvScalar val) -> CvMat
         """
-        return _cv.CvMat___iand__(*args)
+        return _cv.CvMat___iand__(self, *args)
 
-    def __ge__(*args):
+    def __ge__(self, *args):
         """
         __ge__(self, CvArr src) -> CvMat
         __ge__(self, double val) -> CvMat
         """
-        return _cv.CvMat___ge__(*args)
+        return _cv.CvMat___ge__(self, *args)
 
-    def __eq__(*args):
+    def __eq__(self, *args):
         """
         __eq__(self, CvArr src) -> CvMat
         __eq__(self, double val) -> CvMat
         """
-        return _cv.CvMat___eq__(*args)
+        return _cv.CvMat___eq__(self, *args)
 
-    def __le__(*args):
+    def __le__(self, *args):
         """
         __le__(self, CvArr src) -> CvMat
         __le__(self, double val) -> CvMat
         """
-        return _cv.CvMat___le__(*args)
+        return _cv.CvMat___le__(self, *args)
 
-    def __ne__(*args):
+    def __ne__(self, *args):
         """
         __ne__(self, CvArr src) -> CvMat
         __ne__(self, double val) -> CvMat
         """
-        return _cv.CvMat___ne__(*args)
+        return _cv.CvMat___ne__(self, *args)
 
-    def __lt__(*args):
+    def __lt__(self, *args):
         """
         __lt__(self, CvArr src) -> CvMat
         __lt__(self, double val) -> CvMat
         """
-        return _cv.CvMat___lt__(*args)
+        return _cv.CvMat___lt__(self, *args)
 
-    def __gt__(*args):
+    def __gt__(self, *args):
         """
         __gt__(self, CvArr src) -> CvMat
         __gt__(self, double val) -> CvMat
         """
-        return _cv.CvMat___gt__(*args)
+        return _cv.CvMat___gt__(self, *args)
 
-    def __mul__(*args):
+    def __mul__(self, *args):
         """
         __mul__(self, CvArr src) -> CvMat
         __mul__(self, double val) -> CvMat
         """
-        return _cv.CvMat___mul__(*args)
+        return _cv.CvMat___mul__(self, *args)
 
-    def __imul__(*args):
+    def __imul__(self, *args):
         """
         __imul__(self, CvArr src) -> CvMat
         __imul__(self, double val) -> CvMat
         """
-        return _cv.CvMat___imul__(*args)
+        return _cv.CvMat___imul__(self, *args)
 
-    def __div__(*args):
+    def __div__(self, *args):
         """
         __div__(self, CvArr src) -> CvMat
         __div__(self, double val) -> CvMat
         """
-        return _cv.CvMat___div__(*args)
+        return _cv.CvMat___div__(self, *args)
 
-    def __idiv__(*args):
+    def __idiv__(self, *args):
         """
         __idiv__(self, CvArr src) -> CvMat
         __idiv__(self, double val) -> CvMat
         """
-        return _cv.CvMat___idiv__(*args)
+        return _cv.CvMat___idiv__(self, *args)
 
-    def __radd__(*args):
+    def __radd__(self, *args):
         """
         __radd__(self, CvArr arg) -> CvMat
         __radd__(self, CvScalar arg) -> CvMat
         __radd__(self, double arg) -> CvMat
         """
-        return _cv.CvMat___radd__(*args)
+        return _cv.CvMat___radd__(self, *args)
 
-    def __rsub__(*args):
+    def __rsub__(self, *args):
         """
         __rsub__(self, CvArr arg) -> CvMat
         __rsub__(self, CvScalar arg) -> CvMat
         __rsub__(self, double arg) -> CvMat
         """
-        return _cv.CvMat___rsub__(*args)
+        return _cv.CvMat___rsub__(self, *args)
 
-    def __rmul__(*args):
+    def __rmul__(self, *args):
         """
         __rmul__(self, CvArr arg) -> CvMat
         __rmul__(self, double arg) -> CvMat
         """
-        return _cv.CvMat___rmul__(*args)
+        return _cv.CvMat___rmul__(self, *args)
 
-    def __ror__(*args):
+    def __ror__(self, *args):
         """
         __ror__(self, CvScalar arg) -> CvMat
         __ror__(self, double arg) -> CvMat
         """
-        return _cv.CvMat___ror__(*args)
+        return _cv.CvMat___ror__(self, *args)
 
-    def __rand__(*args):
+    def __rand__(self, *args):
         """
         __rand__(self, CvScalar arg) -> CvMat
         __rand__(self, double arg) -> CvMat
         """
-        return _cv.CvMat___rand__(*args)
+        return _cv.CvMat___rand__(self, *args)
 
-    def __rxor__(*args):
+    def __rxor__(self, *args):
         """
         __rxor__(self, CvScalar arg) -> CvMat
         __rxor__(self, double arg) -> CvMat
         """
-        return _cv.CvMat___rxor__(*args)
+        return _cv.CvMat___rxor__(self, *args)
 
-    def __req__(*args):
+    def __req__(self, *args):
         """__req__(self, double arg) -> CvMat"""
-        return _cv.CvMat___req__(*args)
+        return _cv.CvMat___req__(self, *args)
 
-    def __rgt__(*args):
+    def __rgt__(self, *args):
         """__rgt__(self, double arg) -> CvMat"""
-        return _cv.CvMat___rgt__(*args)
+        return _cv.CvMat___rgt__(self, *args)
 
-    def __rge__(*args):
+    def __rge__(self, *args):
         """__rge__(self, double arg) -> CvMat"""
-        return _cv.CvMat___rge__(*args)
+        return _cv.CvMat___rge__(self, *args)
 
-    def __rlt__(*args):
+    def __rlt__(self, *args):
         """__rlt__(self, double arg) -> CvMat"""
-        return _cv.CvMat___rlt__(*args)
+        return _cv.CvMat___rlt__(self, *args)
 
-    def __rle__(*args):
+    def __rle__(self, *args):
         """__rle__(self, double arg) -> CvMat"""
-        return _cv.CvMat___rle__(*args)
+        return _cv.CvMat___rle__(self, *args)
 
-    def __rne__(*args):
+    def __rne__(self, *args):
         """__rne__(self, double arg) -> CvMat"""
-        return _cv.CvMat___rne__(*args)
+        return _cv.CvMat___rne__(self, *args)
 
-    def __rdiv__(*args):
+    def __rdiv__(self, *args):
         """
         __rdiv__(self, CvArr arg) -> CvMat
         __rdiv__(self, double arg) -> CvMat
         """
-        return _cv.CvMat___rdiv__(*args)
+        return _cv.CvMat___rdiv__(self, *args)
 
-    def __pow__(*args):
+    def __pow__(self, *args):
         """__pow__(self, double arg) -> CvMat"""
-        return _cv.CvMat___pow__(*args)
+        return _cv.CvMat___pow__(self, *args)
 
-    def __str__(*args):
+    def __str__(self):
         """__str__(self) -> char"""
-        return _cv.CvMat___str__(*args)
+        return _cv.CvMat___str__(self)
 
-    def __setitem__(*args):
+    def __setitem__(self, *args):
         """
         __setitem__(self, PyObject object, double val)
         __setitem__(self, PyObject object, CvPoint val)
@@ -2363,15 +2376,15 @@ class CvMat(_object):
         __setitem__(self, PyObject object, CvScalar val)
         __setitem__(self, PyObject object, CvArr arr)
         """
-        return _cv.CvMat___setitem__(*args)
+        return _cv.CvMat___setitem__(self, *args)
 
-    def __getitem__(*args):
+    def __getitem__(self, *args):
         """__getitem__(self, PyObject object) -> PyObject"""
-        return _cv.CvMat___getitem__(*args)
+        return _cv.CvMat___getitem__(self, *args)
 
-    def __invert__(*args):
+    def __invert__(self):
         """__invert__(self) -> CvMat"""
-        return _cv.CvMat___invert__(*args)
+        return _cv.CvMat___invert__(self)
 
     def __iter__(self):
        	"""
@@ -2422,6 +2435,62 @@ class CvMat(_object):
     		return True
     	return _cv.CvMat___ne__(self, arg)
 
+    def __get_array_interface__ (self):
+      """Compose numpy array interface
+      
+      Via the numpy array interface, OpenCV data structures can be directly passed to numpy
+      methods without copying / converting. This tremendously speeds up mixing code from
+      OpenCV and numpy.
+      
+      See: http://numpy.scipy.org/array_interface.shtml
+      
+      @author Mark Asbach <asbach@ient.rwth-aachen.de>
+      @date   2009-01-07
+      """
+      
+      if   self.depth == IPL_DEPTH_8U:
+        typestr = '|u1'
+        bytes_per_pixel = 1
+      elif self.depth == IPL_DEPTH_8S:
+        typestr = '|i1'
+        bytes_per_pixel = 1
+      elif self.depth == IPL_DEPTH_16U:
+        typestr = '|u2'
+        bytes_per_pixel = 2
+      elif self.depth == IPL_DEPTH_16S:
+        typestr = '|i2'
+        bytes_per_pixel = 2
+      elif self.depth == IPL_DEPTH_32S:
+        typestr = '|i4'
+        bytes_per_pixel = 4
+      elif self.depth == IPL_DEPTH_32F:
+        typestr = '|f4'
+        bytes_per_pixel = 4
+      elif self.depth == IPL_DEPTH_64F:
+        typestr = '|f8'
+        bytes_per_pixel = 8
+      else:
+        raise TypeError("unknown resp. unhandled OpenCV image/matrix format")
+      
+      if self.nChannels == 1:
+        # monochrome image, matrix with a single channel
+        return {'shape':  (self.height, self.width), 
+               'typestr': typestr, 
+               'version': 3,
+               
+               'data':    (int (self.data.ptr), False),
+               'strides': (int (self.widthStep), int (bytes_per_pixel))}
+      else:
+        # color image, image with alpha, matrix with multiple channels
+        return {'shape':  (self.height, self.width, self.nChannels), 
+               'typestr': typestr, 
+               'version': 3,
+               
+               'data':    (int (self.data.ptr), False),
+               'strides': (int (self.widthStep), int (self.nChannels * bytes_per_pixel), int (bytes_per_pixel))}
+
+    __array_interface__ = property (__get_array_interface__, doc = "numpy array interface description")
+
 
     __swig_setmethods__["imageData"] = _cv.CvMat_imageData_set
     __swig_getmethods__["imageData"] = _cv.CvMat_imageData_get
@@ -2451,9 +2520,9 @@ class CvMat_data(_object):
     __swig_setmethods__["db"] = _cv.CvMat_data_db_set
     __swig_getmethods__["db"] = _cv.CvMat_data_db_get
     if _newclass:db = _swig_property(_cv.CvMat_data_db_get, _cv.CvMat_data_db_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvMat_data"""
-        this = _cv.new_CvMat_data(*args)
+        this = _cv.new_CvMat_data()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvMat_data
@@ -2470,16 +2539,16 @@ def cvmSet(*args):
   """cvmSet(CvMat mat, int row, int col, double value)"""
   return _cv.cvmSet(*args)
 
-def cvCvToIplDepth(*args):
-  """cvCvToIplDepth(int type) -> int"""
-  return _cv.cvCvToIplDepth(*args)
+def cvIplDepth(*args):
+  """cvIplDepth(int type) -> int"""
+  return _cv.cvIplDepth(*args)
 class CvMatND(_object):
     """Proxy of C++ CvMatND class"""
     __swig_setmethods__ = {}
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvMatND, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, CvMatND, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     __swig_setmethods__["type"] = _cv.CvMatND_type_set
     __swig_getmethods__["type"] = _cv.CvMatND_type_get
@@ -2504,7 +2573,7 @@ CvMatND_swigregister(CvMatND)
 
 def cvMat(*args):
   """
-    cvMat(int rows, int cols, int type, void data=None) -> CvMat
+    cvMat(int rows, int cols, int type, void data = None) -> CvMat
     cvMat(int rows, int cols, int type) -> CvMat
     """
   return _cv.cvMat(*args)
@@ -2522,9 +2591,9 @@ class CvMatND_dim(_object):
     __swig_setmethods__["step"] = _cv.CvMatND_dim_step_set
     __swig_getmethods__["step"] = _cv.CvMatND_dim_step_get
     if _newclass:step = _swig_property(_cv.CvMatND_dim_step_get, _cv.CvMatND_dim_step_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvMatND_dim"""
-        this = _cv.new_CvMatND_dim(*args)
+        this = _cv.new_CvMatND_dim()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvMatND_dim
@@ -2554,9 +2623,9 @@ class CvMatND_data(_object):
     __swig_setmethods__["s"] = _cv.CvMatND_data_s_set
     __swig_getmethods__["s"] = _cv.CvMatND_data_s_get
     if _newclass:s = _swig_property(_cv.CvMatND_data_s_get, _cv.CvMatND_data_s_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvMatND_data"""
-        this = _cv.new_CvMatND_data(*args)
+        this = _cv.new_CvMatND_data()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvMatND_data
@@ -2570,7 +2639,7 @@ class CvSparseMat(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvSparseMat, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, CvSparseMat, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     __swig_setmethods__["type"] = _cv.CvSparseMat_type_set
     __swig_getmethods__["type"] = _cv.CvSparseMat_type_get
@@ -2620,9 +2689,9 @@ class CvSparseNode(_object):
     __swig_setmethods__["next"] = _cv.CvSparseNode_next_set
     __swig_getmethods__["next"] = _cv.CvSparseNode_next_get
     if _newclass:next = _swig_property(_cv.CvSparseNode_next_get, _cv.CvSparseNode_next_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSparseNode"""
-        this = _cv.new_CvSparseNode(*args)
+        this = _cv.new_CvSparseNode()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSparseNode
@@ -2646,9 +2715,9 @@ class CvSparseMatIterator(_object):
     __swig_setmethods__["curidx"] = _cv.CvSparseMatIterator_curidx_set
     __swig_getmethods__["curidx"] = _cv.CvSparseMatIterator_curidx_get
     if _newclass:curidx = _swig_property(_cv.CvSparseMatIterator_curidx_get, _cv.CvSparseMatIterator_curidx_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSparseMatIterator"""
-        this = _cv.new_CvSparseMatIterator(*args)
+        this = _cv.new_CvSparseMatIterator()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSparseMatIterator
@@ -2662,7 +2731,7 @@ class CvHistogram(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvHistogram, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, CvHistogram, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     __swig_setmethods__["type"] = _cv.CvHistogram_type_set
     __swig_getmethods__["type"] = _cv.CvHistogram_type_get
@@ -2703,9 +2772,9 @@ class CvRect(_object):
     __swig_setmethods__["height"] = _cv.CvRect_height_set
     __swig_getmethods__["height"] = _cv.CvRect_height_get
     if _newclass:height = _swig_property(_cv.CvRect_height_get, _cv.CvRect_height_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvRect"""
-        this = _cv.new_CvRect(*args)
+        this = _cv.new_CvRect()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvRect
@@ -2741,9 +2810,9 @@ class CvTermCriteria(_object):
     __swig_setmethods__["epsilon"] = _cv.CvTermCriteria_epsilon_set
     __swig_getmethods__["epsilon"] = _cv.CvTermCriteria_epsilon_get
     if _newclass:epsilon = _swig_property(_cv.CvTermCriteria_epsilon_get, _cv.CvTermCriteria_epsilon_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvTermCriteria"""
-        this = _cv.new_CvTermCriteria(*args)
+        this = _cv.new_CvTermCriteria()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvTermCriteria
@@ -2767,17 +2836,17 @@ class CvPoint(_object):
     __swig_setmethods__["y"] = _cv.CvPoint_y_set
     __swig_getmethods__["y"] = _cv.CvPoint_y_get
     if _newclass:y = _swig_property(_cv.CvPoint_y_get, _cv.CvPoint_y_set)
-    def __str__(*args):
+    def __str__(self):
         """__str__(self) -> char"""
-        return _cv.CvPoint___str__(*args)
+        return _cv.CvPoint___str__(self)
 
-    def __repr__(*args):
+    def __repr__(self):
         """__repr__(self) -> char"""
-        return _cv.CvPoint___repr__(*args)
+        return _cv.CvPoint___repr__(self)
 
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvPoint"""
-        this = _cv.new_CvPoint(*args)
+        this = _cv.new_CvPoint()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvPoint
@@ -2801,17 +2870,17 @@ class CvPoint2D32f(_object):
     __swig_setmethods__["y"] = _cv.CvPoint2D32f_y_set
     __swig_getmethods__["y"] = _cv.CvPoint2D32f_y_get
     if _newclass:y = _swig_property(_cv.CvPoint2D32f_y_get, _cv.CvPoint2D32f_y_set)
-    def __str__(*args):
+    def __str__(self):
         """__str__(self) -> char"""
-        return _cv.CvPoint2D32f___str__(*args)
+        return _cv.CvPoint2D32f___str__(self)
 
-    def __repr__(*args):
+    def __repr__(self):
         """__repr__(self) -> char"""
-        return _cv.CvPoint2D32f___repr__(*args)
+        return _cv.CvPoint2D32f___repr__(self)
 
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvPoint2D32f"""
-        this = _cv.new_CvPoint2D32f(*args)
+        this = _cv.new_CvPoint2D32f()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvPoint2D32f
@@ -2847,9 +2916,9 @@ class CvPoint3D32f(_object):
     __swig_setmethods__["z"] = _cv.CvPoint3D32f_z_set
     __swig_getmethods__["z"] = _cv.CvPoint3D32f_z_get
     if _newclass:z = _swig_property(_cv.CvPoint3D32f_z_get, _cv.CvPoint3D32f_z_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvPoint3D32f"""
-        this = _cv.new_CvPoint3D32f(*args)
+        this = _cv.new_CvPoint3D32f()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvPoint3D32f
@@ -2874,9 +2943,9 @@ class CvPoint2D64f(_object):
     __swig_setmethods__["y"] = _cv.CvPoint2D64f_y_set
     __swig_getmethods__["y"] = _cv.CvPoint2D64f_y_get
     if _newclass:y = _swig_property(_cv.CvPoint2D64f_y_get, _cv.CvPoint2D64f_y_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvPoint2D64f"""
-        this = _cv.new_CvPoint2D64f(*args)
+        this = _cv.new_CvPoint2D64f()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvPoint2D64f
@@ -2904,9 +2973,9 @@ class CvPoint3D64f(_object):
     __swig_setmethods__["z"] = _cv.CvPoint3D64f_z_set
     __swig_getmethods__["z"] = _cv.CvPoint3D64f_z_get
     if _newclass:z = _swig_property(_cv.CvPoint3D64f_z_get, _cv.CvPoint3D64f_z_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvPoint3D64f"""
-        this = _cv.new_CvPoint3D64f(*args)
+        this = _cv.new_CvPoint3D64f()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvPoint3D64f
@@ -2931,9 +3000,9 @@ class CvSize(_object):
     __swig_setmethods__["height"] = _cv.CvSize_height_set
     __swig_getmethods__["height"] = _cv.CvSize_height_get
     if _newclass:height = _swig_property(_cv.CvSize_height_get, _cv.CvSize_height_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSize"""
-        this = _cv.new_CvSize(*args)
+        this = _cv.new_CvSize()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSize
@@ -2958,9 +3027,9 @@ class CvSize2D32f(_object):
     __swig_setmethods__["height"] = _cv.CvSize2D32f_height_set
     __swig_getmethods__["height"] = _cv.CvSize2D32f_height_get
     if _newclass:height = _swig_property(_cv.CvSize2D32f_height_get, _cv.CvSize2D32f_height_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSize2D32f"""
-        this = _cv.new_CvSize2D32f(*args)
+        this = _cv.new_CvSize2D32f()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSize2D32f
@@ -2988,9 +3057,9 @@ class CvBox2D(_object):
     __swig_setmethods__["angle"] = _cv.CvBox2D_angle_set
     __swig_getmethods__["angle"] = _cv.CvBox2D_angle_get
     if _newclass:angle = _swig_property(_cv.CvBox2D_angle_get, _cv.CvBox2D_angle_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvBox2D"""
-        this = _cv.new_CvBox2D(*args)
+        this = _cv.new_CvBox2D()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvBox2D
@@ -3023,9 +3092,9 @@ class CvLineIterator(_object):
     __swig_setmethods__["minus_step"] = _cv.CvLineIterator_minus_step_set
     __swig_getmethods__["minus_step"] = _cv.CvLineIterator_minus_step_get
     if _newclass:minus_step = _swig_property(_cv.CvLineIterator_minus_step_get, _cv.CvLineIterator_minus_step_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvLineIterator"""
-        this = _cv.new_CvLineIterator(*args)
+        this = _cv.new_CvLineIterator()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvLineIterator
@@ -3046,9 +3115,9 @@ class CvSlice(_object):
     __swig_setmethods__["end_index"] = _cv.CvSlice_end_index_set
     __swig_getmethods__["end_index"] = _cv.CvSlice_end_index_get
     if _newclass:end_index = _swig_property(_cv.CvSlice_end_index_get, _cv.CvSlice_end_index_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSlice"""
-        this = _cv.new_CvSlice(*args)
+        this = _cv.new_CvSlice()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSlice
@@ -3069,25 +3138,25 @@ class CvScalar(_object):
     __swig_setmethods__["val"] = _cv.CvScalar_val_set
     __swig_getmethods__["val"] = _cv.CvScalar_val_get
     if _newclass:val = _swig_property(_cv.CvScalar_val_get, _cv.CvScalar_val_set)
-    def __str__(*args):
+    def __str__(self):
         """__str__(self) -> char"""
-        return _cv.CvScalar___str__(*args)
+        return _cv.CvScalar___str__(self)
 
-    def __repr__(*args):
+    def __repr__(self):
         """__repr__(self) -> char"""
-        return _cv.CvScalar___repr__(*args)
+        return _cv.CvScalar___repr__(self)
 
-    def __getitem__(*args):
+    def __getitem__(self, *args):
         """__getitem__(self, int index) -> double"""
-        return _cv.CvScalar___getitem__(*args)
+        return _cv.CvScalar___getitem__(self, *args)
 
-    def __setitem__(*args):
+    def __setitem__(self, *args):
         """__setitem__(self, int index, double value)"""
-        return _cv.CvScalar___setitem__(*args)
+        return _cv.CvScalar___setitem__(self, *args)
 
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvScalar"""
-        this = _cv.new_CvScalar(*args)
+        this = _cv.new_CvScalar()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvScalar
@@ -3116,9 +3185,9 @@ class CvMemBlock(_object):
     __swig_setmethods__["next"] = _cv.CvMemBlock_next_set
     __swig_getmethods__["next"] = _cv.CvMemBlock_next_get
     if _newclass:next = _swig_property(_cv.CvMemBlock_next_get, _cv.CvMemBlock_next_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvMemBlock"""
-        this = _cv.new_CvMemBlock(*args)
+        this = _cv.new_CvMemBlock()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvMemBlock
@@ -3128,9 +3197,9 @@ CvMemBlock_swigregister(CvMemBlock)
 
 def cvScalar(*args):
   """
-    cvScalar(double val0, double val1=0, double val2=0, double val3=0) -> CvScalar
-    cvScalar(double val0, double val1=0, double val2=0) -> CvScalar
-    cvScalar(double val0, double val1=0) -> CvScalar
+    cvScalar(double val0, double val1 = 0, double val2 = 0, double val3 = 0) -> CvScalar
+    cvScalar(double val0, double val1 = 0, double val2 = 0) -> CvScalar
+    cvScalar(double val0, double val1 = 0) -> CvScalar
     cvScalar(double val0) -> CvScalar
     """
   return _cv.cvScalar(*args)
@@ -3141,7 +3210,7 @@ class CvMemStorage(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvMemStorage, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, CvMemStorage, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     __swig_setmethods__["signature"] = _cv.CvMemStorage_signature_set
     __swig_getmethods__["signature"] = _cv.CvMemStorage_signature_get
@@ -3179,9 +3248,9 @@ class CvMemStoragePos(_object):
     __swig_setmethods__["free_space"] = _cv.CvMemStoragePos_free_space_set
     __swig_getmethods__["free_space"] = _cv.CvMemStoragePos_free_space_get
     if _newclass:free_space = _swig_property(_cv.CvMemStoragePos_free_space_get, _cv.CvMemStoragePos_free_space_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvMemStoragePos"""
-        this = _cv.new_CvMemStoragePos(*args)
+        this = _cv.new_CvMemStoragePos()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvMemStoragePos
@@ -3211,9 +3280,9 @@ class CvSeqBlock(_object):
     __swig_setmethods__["data"] = _cv.CvSeqBlock_data_set
     __swig_getmethods__["data"] = _cv.CvSeqBlock_data_get
     if _newclass:data = _swig_property(_cv.CvSeqBlock_data_get, _cv.CvSeqBlock_data_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSeqBlock"""
-        this = _cv.new_CvSeqBlock(*args)
+        this = _cv.new_CvSeqBlock()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSeqBlock
@@ -3297,9 +3366,9 @@ class CvSeq(_object):
     		yield s
     		s = t.cast(s.h_next)
 
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSeq"""
-        this = _cv.new_CvSeq(*args)
+        this = _cv.new_CvSeq()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSeq
@@ -3320,9 +3389,9 @@ class CvSetElem(_object):
     __swig_setmethods__["next_free"] = _cv.CvSetElem_next_free_set
     __swig_getmethods__["next_free"] = _cv.CvSetElem_next_free_get
     if _newclass:next_free = _swig_property(_cv.CvSetElem_next_free_get, _cv.CvSetElem_next_free_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSetElem"""
-        this = _cv.new_CvSetElem(*args)
+        this = _cv.new_CvSetElem()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSetElem
@@ -3385,9 +3454,9 @@ class CvSet(_object):
     __swig_setmethods__["active_count"] = _cv.CvSet_active_count_set
     __swig_getmethods__["active_count"] = _cv.CvSet_active_count_get
     if _newclass:active_count = _swig_property(_cv.CvSet_active_count_get, _cv.CvSet_active_count_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSet"""
-        this = _cv.new_CvSet(*args)
+        this = _cv.new_CvSet()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSet
@@ -3414,9 +3483,9 @@ class CvGraphEdge(_object):
     __swig_setmethods__["vtx"] = _cv.CvGraphEdge_vtx_set
     __swig_getmethods__["vtx"] = _cv.CvGraphEdge_vtx_get
     if _newclass:vtx = _swig_property(_cv.CvGraphEdge_vtx_get, _cv.CvGraphEdge_vtx_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvGraphEdge"""
-        this = _cv.new_CvGraphEdge(*args)
+        this = _cv.new_CvGraphEdge()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvGraphEdge
@@ -3437,9 +3506,9 @@ class CvGraphVtx(_object):
     __swig_setmethods__["first"] = _cv.CvGraphVtx_first_set
     __swig_getmethods__["first"] = _cv.CvGraphVtx_first_get
     if _newclass:first = _swig_property(_cv.CvGraphVtx_first_get, _cv.CvGraphVtx_first_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvGraphVtx"""
-        this = _cv.new_CvGraphVtx(*args)
+        this = _cv.new_CvGraphVtx()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvGraphVtx
@@ -3463,9 +3532,9 @@ class CvGraphVtx2D(_object):
     __swig_setmethods__["ptr"] = _cv.CvGraphVtx2D_ptr_set
     __swig_getmethods__["ptr"] = _cv.CvGraphVtx2D_ptr_get
     if _newclass:ptr = _swig_property(_cv.CvGraphVtx2D_ptr_get, _cv.CvGraphVtx2D_ptr_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvGraphVtx2D"""
-        this = _cv.new_CvGraphVtx2D(*args)
+        this = _cv.new_CvGraphVtx2D()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvGraphVtx2D
@@ -3531,9 +3600,9 @@ class CvGraph(_object):
     __swig_setmethods__["edges"] = _cv.CvGraph_edges_set
     __swig_getmethods__["edges"] = _cv.CvGraph_edges_get
     if _newclass:edges = _swig_property(_cv.CvGraph_edges_get, _cv.CvGraph_edges_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvGraph"""
-        this = _cv.new_CvGraph(*args)
+        this = _cv.new_CvGraph()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvGraph
@@ -3593,9 +3662,9 @@ class CvChain(_object):
     __swig_setmethods__["origin"] = _cv.CvChain_origin_set
     __swig_getmethods__["origin"] = _cv.CvChain_origin_get
     if _newclass:origin = _swig_property(_cv.CvChain_origin_get, _cv.CvChain_origin_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvChain"""
-        this = _cv.new_CvChain(*args)
+        this = _cv.new_CvChain()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvChain
@@ -3661,9 +3730,9 @@ class CvContour(_object):
     __swig_setmethods__["reserved"] = _cv.CvContour_reserved_set
     __swig_getmethods__["reserved"] = _cv.CvContour_reserved_get
     if _newclass:reserved = _swig_property(_cv.CvContour_reserved_get, _cv.CvContour_reserved_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvContour"""
-        this = _cv.new_CvContour(*args)
+        this = _cv.new_CvContour()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvContour
@@ -3696,9 +3765,9 @@ class CvSeqWriter(_object):
     __swig_setmethods__["block_max"] = _cv.CvSeqWriter_block_max_set
     __swig_getmethods__["block_max"] = _cv.CvSeqWriter_block_max_get
     if _newclass:block_max = _swig_property(_cv.CvSeqWriter_block_max_get, _cv.CvSeqWriter_block_max_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSeqWriter"""
-        this = _cv.new_CvSeqWriter(*args)
+        this = _cv.new_CvSeqWriter()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSeqWriter
@@ -3737,9 +3806,9 @@ class CvSeqReader(_object):
     __swig_setmethods__["prev_elem"] = _cv.CvSeqReader_prev_elem_set
     __swig_getmethods__["prev_elem"] = _cv.CvSeqReader_prev_elem_get
     if _newclass:prev_elem = _swig_property(_cv.CvSeqReader_prev_elem_get, _cv.CvSeqReader_prev_elem_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSeqReader"""
-        this = _cv.new_CvSeqReader(*args)
+        this = _cv.new_CvSeqReader()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSeqReader
@@ -3760,9 +3829,9 @@ class CvAttrList(_object):
     __swig_setmethods__["next"] = _cv.CvAttrList_next_set
     __swig_getmethods__["next"] = _cv.CvAttrList_next_get
     if _newclass:next = _swig_property(_cv.CvAttrList_next_get, _cv.CvAttrList_next_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvAttrList"""
-        this = _cv.new_CvAttrList(*args)
+        this = _cv.new_CvAttrList()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvAttrList
@@ -3783,9 +3852,9 @@ class CvString(_object):
     __swig_setmethods__["ptr"] = _cv.CvString_ptr_set
     __swig_getmethods__["ptr"] = _cv.CvString_ptr_get
     if _newclass:ptr = _swig_property(_cv.CvString_ptr_get, _cv.CvString_ptr_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvString"""
-        this = _cv.new_CvString(*args)
+        this = _cv.new_CvString()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvString
@@ -3793,13 +3862,13 @@ class CvString(_object):
 CvString_swigregister = _cv.CvString_swigregister
 CvString_swigregister(CvString)
 
-def cvAttrList(*args):
+def cvAttrList(attr = None, next = None):
   """
-    cvAttrList(char attr=None, CvAttrList next=None) -> CvAttrList
-    cvAttrList(char attr=None) -> CvAttrList
+    cvAttrList(char attr = None, CvAttrList next = None) -> CvAttrList
+    cvAttrList(char attr = None) -> CvAttrList
     cvAttrList() -> CvAttrList
     """
-  return _cv.cvAttrList(*args)
+  return _cv.cvAttrList(attr, next)
 
 class CvStringHashNode(_object):
     """Proxy of C++ CvStringHashNode class"""
@@ -3817,9 +3886,9 @@ class CvStringHashNode(_object):
     __swig_setmethods__["next"] = _cv.CvStringHashNode_next_set
     __swig_getmethods__["next"] = _cv.CvStringHashNode_next_get
     if _newclass:next = _swig_property(_cv.CvStringHashNode_next_get, _cv.CvStringHashNode_next_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvStringHashNode"""
-        this = _cv.new_CvStringHashNode(*args)
+        this = _cv.new_CvStringHashNode()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvStringHashNode
@@ -3842,9 +3911,9 @@ class CvFileNode(_object):
     if _newclass:info = _swig_property(_cv.CvFileNode_info_get, _cv.CvFileNode_info_set)
     __swig_getmethods__["data"] = _cv.CvFileNode_data_get
     if _newclass:data = _swig_property(_cv.CvFileNode_data_get)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvFileNode"""
-        this = _cv.new_CvFileNode(*args)
+        this = _cv.new_CvFileNode()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvFileNode
@@ -3874,9 +3943,9 @@ class CvFileNode_data(_object):
     __swig_setmethods__["map"] = _cv.CvFileNode_data_map_set
     __swig_getmethods__["map"] = _cv.CvFileNode_data_map_get
     if _newclass:map = _swig_property(_cv.CvFileNode_data_map_get, _cv.CvFileNode_data_map_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvFileNode_data"""
-        this = _cv.new_CvFileNode_data(*args)
+        this = _cv.new_CvFileNode_data()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvFileNode_data
@@ -3921,9 +3990,9 @@ class CvTypeInfo(_object):
     __swig_setmethods__["clone"] = _cv.CvTypeInfo_clone_set
     __swig_getmethods__["clone"] = _cv.CvTypeInfo_clone_get
     if _newclass:clone = _swig_property(_cv.CvTypeInfo_clone_get, _cv.CvTypeInfo_clone_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvTypeInfo"""
-        this = _cv.new_CvTypeInfo(*args)
+        this = _cv.new_CvTypeInfo()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvTypeInfo
@@ -3953,9 +4022,9 @@ class CvPluginFuncInfo(_object):
     __swig_setmethods__["loaded_from"] = _cv.CvPluginFuncInfo_loaded_from_set
     __swig_getmethods__["loaded_from"] = _cv.CvPluginFuncInfo_loaded_from_get
     if _newclass:loaded_from = _swig_property(_cv.CvPluginFuncInfo_loaded_from_get, _cv.CvPluginFuncInfo_loaded_from_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvPluginFuncInfo"""
-        this = _cv.new_CvPluginFuncInfo(*args)
+        this = _cv.new_CvPluginFuncInfo()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvPluginFuncInfo
@@ -3982,9 +4051,9 @@ class CvModuleInfo(_object):
     __swig_setmethods__["func_tab"] = _cv.CvModuleInfo_func_tab_set
     __swig_getmethods__["func_tab"] = _cv.CvModuleInfo_func_tab_get
     if _newclass:func_tab = _swig_property(_cv.CvModuleInfo_func_tab_get, _cv.CvModuleInfo_func_tab_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvModuleInfo"""
-        this = _cv.new_CvModuleInfo(*args)
+        this = _cv.new_CvModuleInfo()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvModuleInfo
@@ -4011,8 +4080,8 @@ def cvCreateMatHeader(*args):
 
 def cvInitMatHeader(*args):
   """
-    cvInitMatHeader(CvMat mat, int rows, int cols, int type, void data=None, 
-        int step=0x7fffffff) -> CvMat
+    cvInitMatHeader(CvMat mat, int rows, int cols, int type, void data = None, 
+        int step = 0x7fffffff) -> CvMat
     """
   return _cv.cvInitMatHeader(*args)
 
@@ -4033,34 +4102,31 @@ def cvCloneMat(*args):
   return _cv.cvCloneMat(*args)
 
 def cvGetSubRect(*args):
-  """cvGetSubRect(CvArr arr, CvMat submat, CvRect rect) -> CvMat"""
+  """cvGetSubRect(CvArr arr, CvRect rect) -> CvMat"""
   return _cv.cvGetSubRect(*args)
 
 def cvGetRows(*args):
-  """
-    cvGetRows(CvArr arr, CvMat submat, int start_row, int end_row, 
-        int delta_row=1) -> CvMat
-    """
+  """cvGetRows(CvArr arr, int start_row, int end_row, int delta_row = 1) -> CvMat"""
   return _cv.cvGetRows(*args)
 
 def cvGetRow(*args):
-  """cvGetRow(CvArr arr, CvMat submat, int row) -> CvMat"""
+  """cvGetRow(CvArr arr, int row) -> CvMat"""
   return _cv.cvGetRow(*args)
 
 def cvGetCols(*args):
-  """cvGetCols(CvArr arr, CvMat submat, int start_col, int end_col) -> CvMat"""
+  """cvGetCols(CvArr arr, int start_col, int end_col) -> CvMat"""
   return _cv.cvGetCols(*args)
 
 def cvGetCol(*args):
-  """cvGetCol(CvArr arr, CvMat submat, int col) -> CvMat"""
+  """cvGetCol(CvArr arr, int col) -> CvMat"""
   return _cv.cvGetCol(*args)
 
 def cvGetDiag(*args):
-  """cvGetDiag(CvArr arr, CvMat submat, int diag=0) -> CvMat"""
+  """cvGetDiag(CvArr arr, int diag = 0) -> CvMat"""
   return _cv.cvGetDiag(*args)
 
 def cvScalarToRawData(*args):
-  """cvScalarToRawData(CvScalar scalar, void data, int type, int extend_to_12=0)"""
+  """cvScalarToRawData(CvScalar scalar, void data, int type, int extend_to_12 = 0)"""
   return _cv.cvScalarToRawData(*args)
 
 def cvRawDataToScalar(*args):
@@ -4076,7 +4142,7 @@ def cvCreateMatND(*args):
   return _cv.cvCreateMatND(*args)
 
 def cvInitMatNDHeader(*args):
-  """cvInitMatNDHeader(CvMatND mat, int dims, int type, void data=None) -> CvMatND"""
+  """cvInitMatNDHeader(CvMatND mat, int dims, int type, void data = None) -> CvMatND"""
   return _cv.cvInitMatNDHeader(*args)
 
 def cvCloneMatND(*args):
@@ -4123,9 +4189,9 @@ class CvNArrayIterator(_object):
     __swig_setmethods__["hdr"] = _cv.CvNArrayIterator_hdr_set
     __swig_getmethods__["hdr"] = _cv.CvNArrayIterator_hdr_get
     if _newclass:hdr = _swig_property(_cv.CvNArrayIterator_hdr_get, _cv.CvNArrayIterator_hdr_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvNArrayIterator"""
-        this = _cv.new_CvNArrayIterator(*args)
+        this = _cv.new_CvNArrayIterator()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvNArrayIterator
@@ -4137,7 +4203,7 @@ CvNArrayIterator_swigregister(CvNArrayIterator)
 def cvInitNArrayIterator(*args):
   """
     cvInitNArrayIterator(int count, CvArr arrs, CvArr mask, CvMatND stubs, CvNArrayIterator array_iterator, 
-        int flags=0) -> int
+        int flags = 0) -> int
     """
   return _cv.cvInitNArrayIterator(*args)
 
@@ -4158,21 +4224,21 @@ def cvGetDimSize(*args):
   return _cv.cvGetDimSize(*args)
 
 def cvPtr1D(*args):
-  """cvPtr1D(CvArr arr, int idx0, int type=None) -> uchar"""
+  """cvPtr1D(CvArr arr, int idx0, int type = None) -> uchar"""
   return _cv.cvPtr1D(*args)
 
 def cvPtr2D(*args):
-  """cvPtr2D(CvArr arr, int idx0, int idx1, int type=None) -> uchar"""
+  """cvPtr2D(CvArr arr, int idx0, int idx1, int type = None) -> uchar"""
   return _cv.cvPtr2D(*args)
 
 def cvPtr3D(*args):
-  """cvPtr3D(CvArr arr, int idx0, int idx1, int idx2, int type=None) -> uchar"""
+  """cvPtr3D(CvArr arr, int idx0, int idx1, int idx2, int type = None) -> uchar"""
   return _cv.cvPtr3D(*args)
 
 def cvPtrND(*args):
   """
-    cvPtrND(CvArr arr, int idx, int type=None, int create_node=1, 
-        unsigned int precalc_hashval=None) -> uchar
+    cvPtrND(CvArr arr, int idx, int type = None, int create_node = 1, 
+        unsigned int precalc_hashval = None) -> uchar
     """
   return _cv.cvPtrND(*args)
 
@@ -4245,7 +4311,7 @@ def cvClearND(*args):
   return _cv.cvClearND(*args)
 
 def cvGetMat(*args):
-  """cvGetMat(CvArr arr, CvMat header, int coi=None, int allowND=0) -> CvMat"""
+  """cvGetMat(CvArr arr, int coi = None, int allowND = 0) -> CvMat"""
   return _cv.cvGetMat(*args)
 
 def cvReshapeMatND(*args):
@@ -4256,7 +4322,7 @@ def cvReshapeMatND(*args):
   return _cv.cvReshapeMatND(*args)
 
 def cvReshape(*args):
-  """cvReshape(CvArr arr, CvMat header, int new_cn, int new_rows=0) -> CvMat"""
+  """cvReshape(CvArr arr, int new_cn, int new_rows = 0) -> CvMat"""
   return _cv.cvReshape(*args)
 
 def cvRepeat(*args):
@@ -4276,7 +4342,7 @@ def cvSetData(*args):
   return _cv.cvSetData(*args)
 
 def cvGetRawData(*args):
-  """cvGetRawData(CvArr arr, uchar data, int step=None, CvSize roi_size=None)"""
+  """cvGetRawData(CvArr arr, uchar data, int step = None, CvSize roi_size = None)"""
   return _cv.cvGetRawData(*args)
 
 def cvGetSize(*args):
@@ -4284,11 +4350,11 @@ def cvGetSize(*args):
   return _cv.cvGetSize(*args)
 
 def cvCopy(*args):
-  """cvCopy(CvArr src, CvArr dst, CvArr mask=None)"""
+  """cvCopy(CvArr src, CvArr dst, CvArr mask = None)"""
   return _cv.cvCopy(*args)
 
 def cvSet(*args):
-  """cvSet(CvArr arr, CvScalar value, CvArr mask=None)"""
+  """cvSet(CvArr arr, CvScalar value, CvArr mask = None)"""
   return _cv.cvSet(*args)
 
 def cvSetZero(*args):
@@ -4311,11 +4377,11 @@ def cvMixChannels(*args):
   return _cv.cvMixChannels(*args)
 
 def cvConvertScale(*args):
-  """cvConvertScale(CvArr src, CvArr dst, double scale=1, double shift=0)"""
+  """cvConvertScale(CvArr src, CvArr dst, double scale = 1, double shift = 0)"""
   return _cv.cvConvertScale(*args)
 
 def cvConvertScaleAbs(*args):
-  """cvConvertScaleAbs(CvArr src, CvArr dst, double scale=1, double shift=0)"""
+  """cvConvertScaleAbs(CvArr src, CvArr dst, double scale = 1, double shift = 0)"""
   return _cv.cvConvertScaleAbs(*args)
 
 def cvCheckTermCriteria(*args):
@@ -4323,31 +4389,31 @@ def cvCheckTermCriteria(*args):
   return _cv.cvCheckTermCriteria(*args)
 
 def cvAdd(*args):
-  """cvAdd(CvArr src1, CvArr src2, CvArr dst, CvArr mask=None)"""
+  """cvAdd(CvArr src1, CvArr src2, CvArr dst, CvArr mask = None)"""
   return _cv.cvAdd(*args)
 
 def cvAddS(*args):
-  """cvAddS(CvArr src, CvScalar value, CvArr dst, CvArr mask=None)"""
+  """cvAddS(CvArr src, CvScalar value, CvArr dst, CvArr mask = None)"""
   return _cv.cvAddS(*args)
 
 def cvSub(*args):
-  """cvSub(CvArr src1, CvArr src2, CvArr dst, CvArr mask=None)"""
+  """cvSub(CvArr src1, CvArr src2, CvArr dst, CvArr mask = None)"""
   return _cv.cvSub(*args)
 
 def cvSubS(*args):
-  """cvSubS(CvArr src, CvScalar value, CvArr dst, CvArr mask=None)"""
+  """cvSubS(CvArr src, CvScalar value, CvArr dst, CvArr mask = None)"""
   return _cv.cvSubS(*args)
 
 def cvSubRS(*args):
-  """cvSubRS(CvArr src, CvScalar value, CvArr dst, CvArr mask=None)"""
+  """cvSubRS(CvArr src, CvScalar value, CvArr dst, CvArr mask = None)"""
   return _cv.cvSubRS(*args)
 
 def cvMul(*args):
-  """cvMul(CvArr src1, CvArr src2, CvArr dst, double scale=1)"""
+  """cvMul(CvArr src1, CvArr src2, CvArr dst, double scale = 1)"""
   return _cv.cvMul(*args)
 
 def cvDiv(*args):
-  """cvDiv(CvArr src1, CvArr src2, CvArr dst, double scale=1)"""
+  """cvDiv(CvArr src1, CvArr src2, CvArr dst, double scale = 1)"""
   return _cv.cvDiv(*args)
 
 def cvScaleAdd(*args):
@@ -4366,27 +4432,27 @@ def cvDotProduct(*args):
   return _cv.cvDotProduct(*args)
 
 def cvAnd(*args):
-  """cvAnd(CvArr src1, CvArr src2, CvArr dst, CvArr mask=None)"""
+  """cvAnd(CvArr src1, CvArr src2, CvArr dst, CvArr mask = None)"""
   return _cv.cvAnd(*args)
 
 def cvAndS(*args):
-  """cvAndS(CvArr src, CvScalar value, CvArr dst, CvArr mask=None)"""
+  """cvAndS(CvArr src, CvScalar value, CvArr dst, CvArr mask = None)"""
   return _cv.cvAndS(*args)
 
 def cvOr(*args):
-  """cvOr(CvArr src1, CvArr src2, CvArr dst, CvArr mask=None)"""
+  """cvOr(CvArr src1, CvArr src2, CvArr dst, CvArr mask = None)"""
   return _cv.cvOr(*args)
 
 def cvOrS(*args):
-  """cvOrS(CvArr src, CvScalar value, CvArr dst, CvArr mask=None)"""
+  """cvOrS(CvArr src, CvScalar value, CvArr dst, CvArr mask = None)"""
   return _cv.cvOrS(*args)
 
 def cvXor(*args):
-  """cvXor(CvArr src1, CvArr src2, CvArr dst, CvArr mask=None)"""
+  """cvXor(CvArr src1, CvArr src2, CvArr dst, CvArr mask = None)"""
   return _cv.cvXor(*args)
 
 def cvXorS(*args):
-  """cvXorS(CvArr src, CvScalar value, CvArr dst, CvArr mask=None)"""
+  """cvXorS(CvArr src, CvScalar value, CvArr dst, CvArr mask = None)"""
   return _cv.cvXorS(*args)
 
 def cvNot(*args):
@@ -4435,13 +4501,13 @@ def cvAbsDiffS(*args):
 
 def cvCartToPolar(*args):
   """
-    cvCartToPolar(CvArr x, CvArr y, CvArr magnitude, CvArr angle=None, 
-        int angle_in_degrees=0)
+    cvCartToPolar(CvArr x, CvArr y, CvArr magnitude, CvArr angle = None, 
+        int angle_in_degrees = 0)
     """
   return _cv.cvCartToPolar(*args)
 
 def cvPolarToCart(*args):
-  """cvPolarToCart(CvArr magnitude, CvArr angle, CvArr x, CvArr y, int angle_in_degrees=0)"""
+  """cvPolarToCart(CvArr magnitude, CvArr angle, CvArr x, CvArr y, int angle_in_degrees = 0)"""
   return _cv.cvPolarToCart(*args)
 
 def cvPow(*args):
@@ -4465,7 +4531,7 @@ def cvCbrt(*args):
   return _cv.cvCbrt(*args)
 
 def cvCheckArr(*args):
-  """cvCheckArr(CvArr arr, int flags=0, double min_val=0, double max_val=0) -> int"""
+  """cvCheckArr(CvArr arr, int flags = 0, double min_val = 0, double max_val = 0) -> int"""
   return _cv.cvCheckArr(*args)
 
 def cvRandArr(*args):
@@ -4476,15 +4542,19 @@ def cvRandArr(*args):
   return _cv.cvRandArr(*args)
 
 def cvRandShuffle(*args):
-  """cvRandShuffle(CvArr mat, CvRNG rng, double iter_factor=1.)"""
+  """cvRandShuffle(CvArr mat, CvRNG rng, double iter_factor = 1.)"""
   return _cv.cvRandShuffle(*args)
 
+def cvSort(*args):
+  """cvSort(CvArr src, CvArr dst = None, CvArr idxmat = None, int flags = 0)"""
+  return _cv.cvSort(*args)
+
 def cvSolveCubic(*args):
-  """cvSolveCubic(CvMat coeffs, CvMat roots) -> int"""
+  """cvSolveCubic(CvMat coeffs) -> int"""
   return _cv.cvSolveCubic(*args)
 
 def cvSolvePoly(*args):
-  """cvSolvePoly(CvMat coeffs, CvMat roots, int maxiter=10, int fig=10)"""
+  """cvSolvePoly(CvMat coeffs, int maxiter = 20, int fig = 100)"""
   return _cv.cvSolvePoly(*args)
 
 def cvCrossProduct(*args):
@@ -4494,12 +4564,12 @@ def cvCrossProduct(*args):
 def cvGEMM(*args):
   """
     cvGEMM(CvArr src1, CvArr src2, double alpha, CvArr src3, double beta, 
-        CvArr dst, int tABC=0)
+        CvArr dst, int tABC = 0)
     """
   return _cv.cvGEMM(*args)
 
 def cvTransform(*args):
-  """cvTransform(CvArr src, CvArr dst, CvMat transmat, CvMat shiftvec=None)"""
+  """cvTransform(CvArr src, CvArr dst, CvMat transmat, CvMat shiftvec = None)"""
   return _cv.cvTransform(*args)
 
 def cvPerspectiveTransform(*args):
@@ -4508,8 +4578,8 @@ def cvPerspectiveTransform(*args):
 
 def cvMulTransposed(*args):
   """
-    cvMulTransposed(CvArr src, CvArr dst, int order, CvArr delta=None, 
-        double scale=1.)
+    cvMulTransposed(CvArr src, CvArr dst, int order, CvArr delta = None, 
+        double scale = 1.)
     """
   return _cv.cvMulTransposed(*args)
 
@@ -4517,12 +4587,16 @@ def cvTranspose(*args):
   """cvTranspose(CvArr src, CvArr dst)"""
   return _cv.cvTranspose(*args)
 
+def cvCompleteSymm(*args):
+  """cvCompleteSymm(CvMat matrix, int LtoR = 0)"""
+  return _cv.cvCompleteSymm(*args)
+
 def cvFlip(*args):
-  """cvFlip(CvArr src, CvArr dst=None, int flip_mode=0)"""
+  """cvFlip(CvArr src, CvArr dst = None, int flip_mode = 0)"""
   return _cv.cvFlip(*args)
 
 def cvSVD(*args):
-  """cvSVD(CvArr A, CvArr W, CvArr U=None, CvArr V=None, int flags=0)"""
+  """cvSVD(CvArr A, CvArr W, CvArr U = None, CvArr V = None, int flags = 0)"""
   return _cv.cvSVD(*args)
 
 def cvSVBkSb(*args):
@@ -4530,11 +4604,11 @@ def cvSVBkSb(*args):
   return _cv.cvSVBkSb(*args)
 
 def cvInvert(*args):
-  """cvInvert(CvArr src, CvArr dst, int method=0) -> double"""
+  """cvInvert(CvArr src, CvArr dst, int method = 0) -> double"""
   return _cv.cvInvert(*args)
 
 def cvSolve(*args):
-  """cvSolve(CvArr src1, CvArr src2, CvArr dst, int method=0) -> int"""
+  """cvSolve(CvArr src1, CvArr src2, CvArr dst, int method = 0) -> int"""
   return _cv.cvSolve(*args)
 
 def cvDet(*args):
@@ -4546,11 +4620,14 @@ def cvTrace(*args):
   return _cv.cvTrace(*args)
 
 def cvEigenVV(*args):
-  """cvEigenVV(CvArr mat, CvArr evects, CvArr evals, double eps=0)"""
+  """
+    cvEigenVV(CvArr mat, CvArr evects, CvArr evals, double eps = 0, 
+        int lowindex = -1, int highindex = -1)
+    """
   return _cv.cvEigenVV(*args)
 
 def cvSetIdentity(*args):
-  """cvSetIdentity(CvArr mat, CvScalar value=cvRealScalar(1))"""
+  """cvSetIdentity(CvArr mat, CvScalar value = cvRealScalar(1))"""
   return _cv.cvSetIdentity(*args)
 
 def cvRange(*args):
@@ -4589,37 +4666,34 @@ def cvCountNonZero(*args):
   return _cv.cvCountNonZero(*args)
 
 def cvAvg(*args):
-  """cvAvg(CvArr arr, CvArr mask=None) -> CvScalar"""
+  """cvAvg(CvArr arr, CvArr mask = None) -> CvScalar"""
   return _cv.cvAvg(*args)
 
 def cvAvgSdv(*args):
-  """cvAvgSdv(CvArr arr, CvScalar mean, CvScalar std_dev, CvArr mask=None)"""
+  """cvAvgSdv(CvArr arr, CvScalar mean, CvScalar std_dev, CvArr mask = None)"""
   return _cv.cvAvgSdv(*args)
 
 def cvMinMaxLoc(*args):
-  """
-    cvMinMaxLoc(CvArr arr, double min_val, double max_val, CvPoint min_loc=None, 
-        CvPoint max_loc=None, CvArr mask=None)
-    """
+  """cvMinMaxLoc(CvArr arr, CvArr mask = None)"""
   return _cv.cvMinMaxLoc(*args)
 
 def cvNorm(*args):
-  """cvNorm(CvArr arr1, CvArr arr2=None, int norm_type=4, CvArr mask=None) -> double"""
+  """cvNorm(CvArr arr1, CvArr arr2 = None, int norm_type = 4, CvArr mask = None) -> double"""
   return _cv.cvNorm(*args)
 
 def cvNormalize(*args):
   """
-    cvNormalize(CvArr src, CvArr dst, double a=1., double b=0., int norm_type=4, 
-        CvArr mask=None)
+    cvNormalize(CvArr src, CvArr dst, double a = 1., double b = 0., 
+        int norm_type = 4, CvArr mask = None)
     """
   return _cv.cvNormalize(*args)
 
 def cvReduce(*args):
-  """cvReduce(CvArr src, CvArr dst, int dim=-1, int op=0)"""
+  """cvReduce(CvArr src, CvArr dst, int dim = -1, int op = 0)"""
   return _cv.cvReduce(*args)
 
 def cvDFT(*args):
-  """cvDFT(CvArr src, CvArr dst, int flags, int nonzero_rows=0)"""
+  """cvDFT(CvArr src, CvArr dst, int flags, int nonzero_rows = 0)"""
   return _cv.cvDFT(*args)
 
 def cvMulSpectrums(*args):
@@ -4638,9 +4712,9 @@ def cvSliceLength(*args):
   """cvSliceLength(CvSlice slice, CvSeq seq) -> int"""
   return _cv.cvSliceLength(*args)
 
-def cvCreateMemStorage(*args):
-  """cvCreateMemStorage(int block_size=0) -> CvMemStorage"""
-  return _cv.cvCreateMemStorage(*args)
+def cvCreateMemStorage(block_size = 0):
+  """cvCreateMemStorage(int block_size = 0) -> CvMemStorage"""
+  return _cv.cvCreateMemStorage(block_size)
 
 def cvCreateChildMemStorage(*args):
   """cvCreateChildMemStorage(CvMemStorage parent) -> CvMemStorage"""
@@ -4663,7 +4737,7 @@ def cvMemStorageAlloc(*args):
   return _cv.cvMemStorageAlloc(*args)
 
 def cvMemStorageAllocString(*args):
-  """cvMemStorageAllocString(CvMemStorage storage, char ptr, int len=-1) -> CvString"""
+  """cvMemStorageAllocString(CvMemStorage storage, char ptr, int len = -1) -> CvString"""
   return _cv.cvMemStorageAllocString(*args)
 
 def cvCreateSeq(*args):
@@ -4675,31 +4749,31 @@ def cvSetSeqBlockSize(*args):
   return _cv.cvSetSeqBlockSize(*args)
 
 def cvSeqPush(*args):
-  """cvSeqPush(CvSeq seq, void element=None) -> schar"""
+  """cvSeqPush(CvSeq seq, void element = None) -> schar"""
   return _cv.cvSeqPush(*args)
 
 def cvSeqPushFront(*args):
-  """cvSeqPushFront(CvSeq seq, void element=None) -> schar"""
+  """cvSeqPushFront(CvSeq seq, void element = None) -> schar"""
   return _cv.cvSeqPushFront(*args)
 
 def cvSeqPop(*args):
-  """cvSeqPop(CvSeq seq, void element=None)"""
+  """cvSeqPop(CvSeq seq, void element = None)"""
   return _cv.cvSeqPop(*args)
 
 def cvSeqPopFront(*args):
-  """cvSeqPopFront(CvSeq seq, void element=None)"""
+  """cvSeqPopFront(CvSeq seq, void element = None)"""
   return _cv.cvSeqPopFront(*args)
 
 def cvSeqPushMulti(*args):
-  """cvSeqPushMulti(CvSeq seq, void elements, int count, int in_front=0)"""
+  """cvSeqPushMulti(CvSeq seq, void elements, int count, int in_front = 0)"""
   return _cv.cvSeqPushMulti(*args)
 
 def cvSeqPopMulti(*args):
-  """cvSeqPopMulti(CvSeq seq, void elements, int count, int in_front=0)"""
+  """cvSeqPopMulti(CvSeq seq, void elements, int count, int in_front = 0)"""
   return _cv.cvSeqPopMulti(*args)
 
 def cvSeqInsert(*args):
-  """cvSeqInsert(CvSeq seq, int before_index, void element=None) -> schar"""
+  """cvSeqInsert(CvSeq seq, int before_index, void element = None) -> schar"""
   return _cv.cvSeqInsert(*args)
 
 def cvSeqRemove(*args):
@@ -4715,7 +4789,7 @@ def cvGetSeqElem(*args):
   return _cv.cvGetSeqElem(*args)
 
 def cvSeqElemIdx(*args):
-  """cvSeqElemIdx(CvSeq seq, void element, CvSeqBlock block=None) -> int"""
+  """cvSeqElemIdx(CvSeq seq, void element, CvSeqBlock block = None) -> int"""
   return _cv.cvSeqElemIdx(*args)
 
 def cvStartAppendToSeq(*args):
@@ -4738,7 +4812,7 @@ def cvFlushSeqWriter(*args):
   return _cv.cvFlushSeqWriter(*args)
 
 def cvStartReadSeq(*args):
-  """cvStartReadSeq(CvSeq seq, CvSeqReader reader, int reverse=0)"""
+  """cvStartReadSeq(CvSeq seq, CvSeqReader reader, int reverse = 0)"""
   return _cv.cvStartReadSeq(*args)
 
 def cvGetSeqReaderPos(*args):
@@ -4746,7 +4820,7 @@ def cvGetSeqReaderPos(*args):
   return _cv.cvGetSeqReaderPos(*args)
 
 def cvSetSeqReaderPos(*args):
-  """cvSetSeqReaderPos(CvSeqReader reader, int index, int is_relative=0)"""
+  """cvSetSeqReaderPos(CvSeqReader reader, int index, int is_relative = 0)"""
   return _cv.cvSetSeqReaderPos(*args)
 
 def cvMakeSeqHeaderForArray(*args):
@@ -4758,13 +4832,13 @@ def cvMakeSeqHeaderForArray(*args):
 
 def cvSeqSlice(*args):
   """
-    cvSeqSlice(CvSeq seq, CvSlice slice, CvMemStorage storage=None, 
-        int copy_data=0) -> CvSeq
+    cvSeqSlice(CvSeq seq, CvSlice slice, CvMemStorage storage = None, 
+        int copy_data = 0) -> CvSeq
     """
   return _cv.cvSeqSlice(*args)
 
 def cvCloneSeq(*args):
-  """cvCloneSeq(CvSeq seq, CvMemStorage storage=None) -> CvSeq"""
+  """cvCloneSeq(CvSeq seq, CvMemStorage storage = None) -> CvSeq"""
   return _cv.cvCloneSeq(*args)
 
 def cvSeqRemoveSlice(*args):
@@ -4776,13 +4850,13 @@ def cvSeqInsertSlice(*args):
   return _cv.cvSeqInsertSlice(*args)
 
 def cvSeqSort(*args):
-  """cvSeqSort(CvSeq seq, CvCmpFunc func, void userdata=None)"""
+  """cvSeqSort(CvSeq seq, CvCmpFunc func, void userdata = None)"""
   return _cv.cvSeqSort(*args)
 
 def cvSeqSearch(*args):
   """
     cvSeqSearch(CvSeq seq, void elem, CvCmpFunc func, int is_sorted, 
-        int elem_idx, void userdata=None) -> schar
+        int elem_idx, void userdata = None) -> schar
     """
   return _cv.cvSeqSearch(*args)
 
@@ -4810,7 +4884,7 @@ def cvCreateSet(*args):
   return _cv.cvCreateSet(*args)
 
 def cvSetAdd(*args):
-  """cvSetAdd(CvSet set_header, CvSetElem elem=None, CvSetElem inserted_elem=None) -> int"""
+  """cvSetAdd(CvSet set_header, CvSetElem elem = None, CvSetElem inserted_elem = None) -> int"""
   return _cv.cvSetAdd(*args)
 
 def cvSetNew(*args):
@@ -4841,7 +4915,7 @@ def cvCreateGraph(*args):
   return _cv.cvCreateGraph(*args)
 
 def cvGraphAddVtx(*args):
-  """cvGraphAddVtx(CvGraph graph, CvGraphVtx vtx=None, CvGraphVtx inserted_vtx=None) -> int"""
+  """cvGraphAddVtx(CvGraph graph, CvGraphVtx vtx = None, CvGraphVtx inserted_vtx = None) -> int"""
   return _cv.cvGraphAddVtx(*args)
 
 def cvGraphRemoveVtx(*args):
@@ -4854,15 +4928,15 @@ def cvGraphRemoveVtxByPtr(*args):
 
 def cvGraphAddEdge(*args):
   """
-    cvGraphAddEdge(CvGraph graph, int start_idx, int end_idx, CvGraphEdge edge=None, 
-        CvGraphEdge inserted_edge=None) -> int
+    cvGraphAddEdge(CvGraph graph, int start_idx, int end_idx, CvGraphEdge edge = None, 
+        CvGraphEdge inserted_edge = None) -> int
     """
   return _cv.cvGraphAddEdge(*args)
 
 def cvGraphAddEdgeByPtr(*args):
   """
     cvGraphAddEdgeByPtr(CvGraph graph, CvGraphVtx start_vtx, CvGraphVtx end_vtx, 
-        CvGraphEdge edge=None, CvGraphEdge inserted_edge=None) -> int
+        CvGraphEdge edge = None, CvGraphEdge inserted_edge = None) -> int
     """
   return _cv.cvGraphAddEdgeByPtr(*args)
 
@@ -4899,7 +4973,7 @@ class CvGraphScanner(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvGraphScanner, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, CvGraphScanner, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     __swig_setmethods__["vtx"] = _cv.CvGraphScanner_vtx_set
     __swig_getmethods__["vtx"] = _cv.CvGraphScanner_vtx_get
@@ -4929,7 +5003,7 @@ CvGraphScanner_swigregister(CvGraphScanner)
 
 
 def cvCreateGraphScanner(*args):
-  """cvCreateGraphScanner(CvGraph graph, CvGraphVtx vtx=None, int mask=-1) -> CvGraphScanner"""
+  """cvCreateGraphScanner(CvGraph graph, CvGraphVtx vtx = None, int mask = -1) -> CvGraphScanner"""
   return _cv.cvCreateGraphScanner(*args)
 
 def cvNextGraphItem(*args):
@@ -4943,21 +5017,21 @@ def cvCloneGraph(*args):
 def cvLine(*args):
   """
     cvLine(CvArr img, CvPoint pt1, CvPoint pt2, CvScalar color, 
-        int thickness=1, int line_type=8, int shift=0)
+        int thickness = 1, int line_type = 8, int shift = 0)
     """
   return _cv.cvLine(*args)
 
 def cvRectangle(*args):
   """
     cvRectangle(CvArr img, CvPoint pt1, CvPoint pt2, CvScalar color, 
-        int thickness=1, int line_type=8, int shift=0)
+        int thickness = 1, int line_type = 8, int shift = 0)
     """
   return _cv.cvRectangle(*args)
 
 def cvCircle(*args):
   """
     cvCircle(CvArr img, CvPoint center, int radius, CvScalar color, 
-        int thickness=1, int line_type=8, int shift=0)
+        int thickness = 1, int line_type = 8, int shift = 0)
     """
   return _cv.cvCircle(*args)
 
@@ -4965,36 +5039,37 @@ def cvEllipse(*args):
   """
     cvEllipse(CvArr img, CvPoint center, CvSize axes, double angle, 
         double start_angle, double end_angle, CvScalar color, 
-        int thickness=1, int line_type=8, 
-        int shift=0)
+        int thickness = 1, int line_type = 8, 
+        int shift = 0)
     """
   return _cv.cvEllipse(*args)
 
 def cvEllipseBox(*args):
   """
-    cvEllipseBox(CvArr img, CvBox2D box, CvScalar color, int thickness=1, 
-        int line_type=8, int shift=0)
+    cvEllipseBox(CvArr img, CvBox2D box, CvScalar color, int thickness = 1, 
+        int line_type = 8, int shift = 0)
     """
   return _cv.cvEllipseBox(*args)
 
 def cvFillConvexPoly(*args):
   """
-    cvFillConvexPoly(CvArr img, CvPoint pts, CvScalar color, int line_type=8, 
-        int shift=0)
+    cvFillConvexPoly(CvArr img, CvPoint pts, int npts, CvScalar color, int line_type = 8, 
+        int shift = 0)
     """
   return _cv.cvFillConvexPoly(*args)
 
 def cvFillPoly(*args):
   """
-    cvFillPoly(CvArr img, CvPoint pts, CvScalar color, int line_type=8, 
-        int shift=0)
+    cvFillPoly(CvArr img, CvPoint pts, int npts, int contours, CvScalar color, 
+        int line_type = 8, int shift = 0)
     """
   return _cv.cvFillPoly(*args)
 
 def cvPolyLine(*args):
   """
-    cvPolyLine(CvArr img, CvPoint pts, int is_closed, CvScalar color, 
-        int thickness=1, int line_type=8, int shift=0)
+    cvPolyLine(CvArr img, CvPoint pts, int npts, int contours, int is_closed, 
+        CvScalar color, int thickness = 1, 
+        int line_type = 8, int shift = 0)
     """
   return _cv.cvPolyLine(*args)
 
@@ -5005,7 +5080,7 @@ def cvClipLine(*args):
 def cvInitLineIterator(*args):
   """
     cvInitLineIterator(CvArr image, CvPoint pt1, CvPoint pt2, CvLineIterator line_iterator, 
-        int connectivity=8, int left_to_right=0) -> int
+        int connectivity = 8, int left_to_right = 0) -> int
     """
   return _cv.cvInitLineIterator(*args)
 class CvFont(_object):
@@ -5045,9 +5120,9 @@ class CvFont(_object):
     __swig_setmethods__["line_type"] = _cv.CvFont_line_type_set
     __swig_getmethods__["line_type"] = _cv.CvFont_line_type_get
     if _newclass:line_type = _swig_property(_cv.CvFont_line_type_get, _cv.CvFont_line_type_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvFont"""
-        this = _cv.new_CvFont(*args)
+        this = _cv.new_CvFont()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvFont
@@ -5058,13 +5133,13 @@ CvFont_swigregister(CvFont)
 
 def cvInitFont(*args):
   """
-    cvInitFont(CvFont font, double hscale, double vscale, double shear=0, 
-        int thickness=1, int line_type=8)
+    cvInitFont(CvFont font, double hscale, double vscale, double shear = 0, 
+        int thickness = 1, int line_type = 8)
     """
   return _cv.cvInitFont(*args)
 
 def cvFont(*args):
-  """cvFont(double scale, int thickness=1) -> CvFont"""
+  """cvFont(double scale, int thickness = 1) -> CvFont"""
   return _cv.cvFont(*args)
 
 def cvPutText(*args):
@@ -5072,7 +5147,7 @@ def cvPutText(*args):
   return _cv.cvPutText(*args)
 
 def cvGetTextSize(*args):
-  """cvGetTextSize(char text_string, CvFont font, CvSize text_size)"""
+  """cvGetTextSize(char text_string, CvFont font)"""
   return _cv.cvGetTextSize(*args)
 
 def cvColorToScalar(*args):
@@ -5089,8 +5164,8 @@ def cvEllipse2Poly(*args):
 def cvDrawContours(*args):
   """
     cvDrawContours(CvArr img, CvSeq contour, CvScalar external_color, 
-        CvScalar hole_color, int max_level, int thickness=1, 
-        int line_type=8, CvPoint offset=cvPoint(0,0))
+        CvScalar hole_color, int max_level, int thickness = 1, 
+        int line_type = 8, CvPoint offset = cvPoint(0,0))
     """
   return _cv.cvDrawContours(*args)
 
@@ -5113,9 +5188,9 @@ class CvTreeNodeIterator(_object):
     __swig_setmethods__["max_level"] = _cv.CvTreeNodeIterator_max_level_set
     __swig_getmethods__["max_level"] = _cv.CvTreeNodeIterator_max_level_get
     if _newclass:max_level = _swig_property(_cv.CvTreeNodeIterator_max_level_get, _cv.CvTreeNodeIterator_max_level_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvTreeNodeIterator"""
-        this = _cv.new_CvTreeNodeIterator(*args)
+        this = _cv.new_CvTreeNodeIterator()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvTreeNodeIterator
@@ -5149,7 +5224,12 @@ def cvTreeToNodeSeq(*args):
   return _cv.cvTreeToNodeSeq(*args)
 
 def cvKMeans2(*args):
-  """cvKMeans2(CvArr samples, int cluster_count, CvArr labels, CvTermCriteria termcrit)"""
+  """
+    cvKMeans2(CvArr samples, int cluster_count, CvArr labels, CvTermCriteria termcrit, 
+        int attempts = 1, CvRNG rng = None, 
+        int flags = 0, CvArr _centers = None, 
+        double compactness = None) -> int
+    """
   return _cv.cvKMeans2(*args)
 
 def cvRegisterModule(*args):
@@ -5164,17 +5244,17 @@ def cvGetModuleInfo(*args):
   """cvGetModuleInfo(char module_name, char version, char loaded_addon_plugins)"""
   return _cv.cvGetModuleInfo(*args)
 
-def cvGetErrStatus(*args):
+def cvGetErrStatus():
   """cvGetErrStatus() -> int"""
-  return _cv.cvGetErrStatus(*args)
+  return _cv.cvGetErrStatus()
 
 def cvSetErrStatus(*args):
   """cvSetErrStatus(int status)"""
   return _cv.cvSetErrStatus(*args)
 
-def cvGetErrMode(*args):
+def cvGetErrMode():
   """cvGetErrMode() -> int"""
-  return _cv.cvGetErrMode(*args)
+  return _cv.cvGetErrMode()
 
 def cvSetErrMode(*args):
   """cvSetErrMode(int mode) -> int"""
@@ -5204,8 +5284,8 @@ def cvErrorFromIppStatus(*args):
 
 def cvRedirectError(*args):
   """
-    cvRedirectError(CvErrorCallback error_handler, void userdata=None, 
-        void prev_userdata=None) -> CvErrorCallback
+    cvRedirectError(CvErrorCallback error_handler, void userdata = None, 
+        void prev_userdata = None) -> CvErrorCallback
     """
   return _cv.cvRedirectError(*args)
 
@@ -5230,12 +5310,12 @@ def cvGuiBoxReport(*args):
     """
   return _cv.cvGuiBoxReport(*args)
 
-def cvSetMemoryManager(*args):
+def cvSetMemoryManager(alloc_func = None, free_func = None, userdata = None):
   """
-    cvSetMemoryManager(CvAllocFunc alloc_func=None, CvFreeFunc free_func=None, 
-        void userdata=None)
+    cvSetMemoryManager(CvAllocFunc alloc_func = None, CvFreeFunc free_func = None, 
+        void userdata = None)
     """
-  return _cv.cvSetMemoryManager(*args)
+  return _cv.cvSetMemoryManager(alloc_func, free_func, userdata)
 
 def cvSetIPLAllocators(*args):
   """
@@ -5249,14 +5329,18 @@ def cvOpenFileStorage(*args):
   """cvOpenFileStorage(char filename, CvMemStorage memstorage, int flags) -> CvFileStorage"""
   return _cv.cvOpenFileStorage(*args)
 
+def cvReleaseFileStorage(*args):
+  """cvReleaseFileStorage(CvFileStorage fs)"""
+  return _cv.cvReleaseFileStorage(*args)
+
 def cvAttrValue(*args):
   """cvAttrValue(CvAttrList attr, char attr_name) -> char"""
   return _cv.cvAttrValue(*args)
 
 def cvStartWriteStruct(*args):
   """
-    cvStartWriteStruct(CvFileStorage fs, char name, int struct_flags, char type_name=None, 
-        CvAttrList attributes=cvAttrList())
+    cvStartWriteStruct(CvFileStorage fs, char name, int struct_flags, char type_name = None, 
+        CvAttrList attributes = cvAttrList())
     """
   return _cv.cvStartWriteStruct(*args)
 
@@ -5273,7 +5357,7 @@ def cvWriteReal(*args):
   return _cv.cvWriteReal(*args)
 
 def cvWriteString(*args):
-  """cvWriteString(CvFileStorage fs, char name, char str, int quote=0)"""
+  """cvWriteString(CvFileStorage fs, char name, char str, int quote = 0)"""
   return _cv.cvWriteString(*args)
 
 def cvWriteComment(*args):
@@ -5281,7 +5365,7 @@ def cvWriteComment(*args):
   return _cv.cvWriteComment(*args)
 
 def cvWrite(*args):
-  """cvWrite(CvFileStorage fs, char name, void ptr, CvAttrList attributes=cvAttrList())"""
+  """cvWrite(CvFileStorage fs, char name, void ptr, CvAttrList attributes = cvAttrList())"""
   return _cv.cvWrite(*args)
 
 def cvStartNextStream(*args):
@@ -5293,17 +5377,17 @@ def cvWriteRawData(*args):
   return _cv.cvWriteRawData(*args)
 
 def cvGetHashedKey(*args):
-  """cvGetHashedKey(CvFileStorage fs, char name, int len=-1, int create_missing=0) -> CvStringHashNode"""
+  """cvGetHashedKey(CvFileStorage fs, char name, int len = -1, int create_missing = 0) -> CvStringHashNode"""
   return _cv.cvGetHashedKey(*args)
 
 def cvGetRootFileNode(*args):
-  """cvGetRootFileNode(CvFileStorage fs, int stream_index=0) -> CvFileNode"""
+  """cvGetRootFileNode(CvFileStorage fs, int stream_index = 0) -> CvFileNode"""
   return _cv.cvGetRootFileNode(*args)
 
 def cvGetFileNode(*args):
   """
     cvGetFileNode(CvFileStorage fs, CvFileNode map, CvStringHashNode key, 
-        int create_missing=0) -> CvFileNode
+        int create_missing = 0) -> CvFileNode
     """
   return _cv.cvGetFileNode(*args)
 
@@ -5312,35 +5396,35 @@ def cvGetFileNodeByName(*args):
   return _cv.cvGetFileNodeByName(*args)
 
 def cvReadInt(*args):
-  """cvReadInt(CvFileNode node, int default_value=0) -> int"""
+  """cvReadInt(CvFileNode node, int default_value = 0) -> int"""
   return _cv.cvReadInt(*args)
 
 def cvReadIntByName(*args):
-  """cvReadIntByName(CvFileStorage fs, CvFileNode map, char name, int default_value=0) -> int"""
+  """cvReadIntByName(CvFileStorage fs, CvFileNode map, char name, int default_value = 0) -> int"""
   return _cv.cvReadIntByName(*args)
 
 def cvReadReal(*args):
-  """cvReadReal(CvFileNode node, double default_value=0.) -> double"""
+  """cvReadReal(CvFileNode node, double default_value = 0.) -> double"""
   return _cv.cvReadReal(*args)
 
 def cvReadRealByName(*args):
-  """cvReadRealByName(CvFileStorage fs, CvFileNode map, char name, double default_value=0.) -> double"""
+  """cvReadRealByName(CvFileStorage fs, CvFileNode map, char name, double default_value = 0.) -> double"""
   return _cv.cvReadRealByName(*args)
 
 def cvReadString(*args):
-  """cvReadString(CvFileNode node, char default_value=None) -> char"""
+  """cvReadString(CvFileNode node, char default_value = None) -> char"""
   return _cv.cvReadString(*args)
 
 def cvReadStringByName(*args):
-  """cvReadStringByName(CvFileStorage fs, CvFileNode map, char name, char default_value=None) -> char"""
+  """cvReadStringByName(CvFileStorage fs, CvFileNode map, char name, char default_value = None) -> char"""
   return _cv.cvReadStringByName(*args)
 
 def cvRead(*args):
-  """cvRead(CvFileStorage fs, CvFileNode node, CvAttrList attributes=None) -> void"""
+  """cvRead(CvFileStorage fs, CvFileNode node, CvAttrList attributes = None) -> void"""
   return _cv.cvRead(*args)
 
 def cvReadByName(*args):
-  """cvReadByName(CvFileStorage fs, CvFileNode map, char name, CvAttrList attributes=None) -> void"""
+  """cvReadByName(CvFileStorage fs, CvFileNode map, char name, CvAttrList attributes = None) -> void"""
   return _cv.cvReadByName(*args)
 
 def cvStartReadRawData(*args):
@@ -5377,9 +5461,9 @@ def cvUnregisterType(*args):
   """cvUnregisterType(char type_name)"""
   return _cv.cvUnregisterType(*args)
 
-def cvFirstType(*args):
+def cvFirstType():
   """cvFirstType() -> CvTypeInfo"""
-  return _cv.cvFirstType(*args)
+  return _cv.cvFirstType()
 
 def cvFindType(*args):
   """cvFindType(char type_name) -> CvTypeInfo"""
@@ -5395,37 +5479,44 @@ def cvClone(*args):
 
 def cvSave(*args):
   """
-    cvSave(char filename, void struct_ptr, char name=None, char comment=None, 
-        CvAttrList attributes=cvAttrList())
+    cvSave(char filename, void struct_ptr, char name = None, char comment = None, 
+        CvAttrList attributes = cvAttrList())
     """
   return _cv.cvSave(*args)
 
 def cvLoad(*args):
   """
-    cvLoad(char filename, CvMemStorage memstorage=None, char name=None, 
-        char real_name=None) -> void
+    cvLoad(char filename, CvMemStorage memstorage = None, char name = None, 
+        char real_name = None) -> void
     """
   return _cv.cvLoad(*args)
 
-def cvGetTickCount(*args):
+def cvGetTickCount():
   """cvGetTickCount() -> int64"""
-  return _cv.cvGetTickCount(*args)
+  return _cv.cvGetTickCount()
 
-def cvGetTickFrequency(*args):
+def cvGetTickFrequency():
   """cvGetTickFrequency() -> double"""
-  return _cv.cvGetTickFrequency(*args)
+  return _cv.cvGetTickFrequency()
 
-def cvGetNumThreads(*args):
+def cvGetNumThreads():
   """cvGetNumThreads() -> int"""
-  return _cv.cvGetNumThreads(*args)
+  return _cv.cvGetNumThreads()
 
-def cvSetNumThreads(*args):
-  """cvSetNumThreads(int threads=0)"""
-  return _cv.cvSetNumThreads(*args)
+def cvSetNumThreads(threads = 0):
+  """cvSetNumThreads(int threads = 0)"""
+  return _cv.cvSetNumThreads(threads)
 
-def cvGetThreadNum(*args):
+def cvGetThreadNum():
   """cvGetThreadNum() -> int"""
-  return _cv.cvGetThreadNum(*args)
+  return _cv.cvGetThreadNum()
+
+def cvSetImageIOFunctions(*args):
+  """
+    cvSetImageIOFunctions(CvLoadImageFunc _load_image, CvLoadImageMFunc _load_image_m, 
+        CvSaveImageFunc _save_image, CvShowImageFunc _show_image) -> int
+    """
+  return _cv.cvSetImageIOFunctions(*args)
 class CvImage(_object):
     """Proxy of C++ CvImage class"""
     __swig_setmethods__ = {}
@@ -5439,8 +5530,8 @@ class CvImage(_object):
         __init__(self, CvSize size, int depth, int channels) -> CvImage
         __init__(self,  img) -> CvImage
         __init__(self, CvImage img) -> CvImage
-        __init__(self, char filename, char imgname=0, int color=-1) -> CvImage
-        __init__(self, char filename, char imgname=0) -> CvImage
+        __init__(self, char filename, char imgname = None, int color = -1) -> CvImage
+        __init__(self, char filename, char imgname = None) -> CvImage
         __init__(self, char filename) -> CvImage
         __init__(self, CvFileStorage fs, char mapname, char imgname) -> CvImage
         __init__(self, CvFileStorage fs, char seqname, int idx) -> CvImage
@@ -5450,137 +5541,140 @@ class CvImage(_object):
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvImage
     __del__ = lambda self : None;
-    def clone(*args):
+    def clone(self):
         """clone(self) -> CvImage"""
-        return _cv.CvImage_clone(*args)
+        return _cv.CvImage_clone(self)
 
-    def create(*args):
+    def create(self, *args):
         """create(self, CvSize size, int depth, int channels)"""
-        return _cv.CvImage_create(*args)
+        return _cv.CvImage_create(self, *args)
 
-    def release(*args):
+    def release(self):
         """release(self)"""
-        return _cv.CvImage_release(*args)
+        return _cv.CvImage_release(self)
 
-    def clear(*args):
+    def clear(self):
         """clear(self)"""
-        return _cv.CvImage_clear(*args)
+        return _cv.CvImage_clear(self)
 
-    def attach(*args):
+    def attach(self, *args):
         """
-        attach(self,  img, bool use_refcount=True)
+        attach(self,  img, bool use_refcount = True)
         attach(self,  img)
         """
-        return _cv.CvImage_attach(*args)
+        return _cv.CvImage_attach(self, *args)
 
-    def detach(*args):
+    def detach(self):
         """detach(self)"""
-        return _cv.CvImage_detach(*args)
+        return _cv.CvImage_detach(self)
 
-    def load(*args):
+    def load(self, *args):
         """
-        load(self, char filename, char imgname=0, int color=-1) -> bool
-        load(self, char filename, char imgname=0) -> bool
+        load(self, char filename, char imgname = None, int color = -1) -> bool
+        load(self, char filename, char imgname = None) -> bool
         load(self, char filename) -> bool
         """
-        return _cv.CvImage_load(*args)
+        return _cv.CvImage_load(self, *args)
 
-    def read(*args):
+    def read(self, *args):
         """
         read(self, CvFileStorage fs, char mapname, char imgname) -> bool
         read(self, CvFileStorage fs, char seqname, int idx) -> bool
         """
-        return _cv.CvImage_read(*args)
+        return _cv.CvImage_read(self, *args)
 
-    def save(*args):
-        """save(self, char filename, char imgname)"""
-        return _cv.CvImage_save(*args)
+    def save(self, *args):
+        """
+        save(self, char filename, char imgname, int params = None)
+        save(self, char filename, char imgname)
+        """
+        return _cv.CvImage_save(self, *args)
 
-    def write(*args):
+    def write(self, *args):
         """write(self, CvFileStorage fs, char imgname)"""
-        return _cv.CvImage_write(*args)
+        return _cv.CvImage_write(self, *args)
 
-    def show(*args):
+    def show(self, *args):
         """show(self, char window_name)"""
-        return _cv.CvImage_show(*args)
+        return _cv.CvImage_show(self, *args)
 
-    def is_valid(*args):
+    def is_valid(self):
         """is_valid(self) -> bool"""
-        return _cv.CvImage_is_valid(*args)
+        return _cv.CvImage_is_valid(self)
 
-    def width(*args):
+    def width(self):
         """width(self) -> int"""
-        return _cv.CvImage_width(*args)
+        return _cv.CvImage_width(self)
 
-    def height(*args):
+    def height(self):
         """height(self) -> int"""
-        return _cv.CvImage_height(*args)
+        return _cv.CvImage_height(self)
 
-    def size(*args):
+    def size(self):
         """size(self) -> CvSize"""
-        return _cv.CvImage_size(*args)
+        return _cv.CvImage_size(self)
 
-    def roi_size(*args):
+    def roi_size(self):
         """roi_size(self) -> CvSize"""
-        return _cv.CvImage_roi_size(*args)
+        return _cv.CvImage_roi_size(self)
 
-    def roi(*args):
+    def roi(self):
         """roi(self) -> CvRect"""
-        return _cv.CvImage_roi(*args)
+        return _cv.CvImage_roi(self)
 
-    def coi(*args):
+    def coi(self):
         """coi(self) -> int"""
-        return _cv.CvImage_coi(*args)
+        return _cv.CvImage_coi(self)
 
-    def set_roi(*args):
+    def set_roi(self, *args):
         """set_roi(self, CvRect roi)"""
-        return _cv.CvImage_set_roi(*args)
+        return _cv.CvImage_set_roi(self, *args)
 
-    def reset_roi(*args):
+    def reset_roi(self):
         """reset_roi(self)"""
-        return _cv.CvImage_reset_roi(*args)
+        return _cv.CvImage_reset_roi(self)
 
-    def set_coi(*args):
+    def set_coi(self, *args):
         """set_coi(self, int coi)"""
-        return _cv.CvImage_set_coi(*args)
+        return _cv.CvImage_set_coi(self, *args)
 
-    def depth(*args):
+    def depth(self):
         """depth(self) -> int"""
-        return _cv.CvImage_depth(*args)
+        return _cv.CvImage_depth(self)
 
-    def channels(*args):
+    def channels(self):
         """channels(self) -> int"""
-        return _cv.CvImage_channels(*args)
+        return _cv.CvImage_channels(self)
 
-    def pix_size(*args):
+    def pix_size(self):
         """pix_size(self) -> int"""
-        return _cv.CvImage_pix_size(*args)
+        return _cv.CvImage_pix_size(self)
 
-    def data(*args):
+    def data(self, *args):
         """
         data(self) -> uchar
         data(self) -> uchar
         """
-        return _cv.CvImage_data(*args)
+        return _cv.CvImage_data(self, *args)
 
-    def step(*args):
+    def step(self):
         """step(self) -> int"""
-        return _cv.CvImage_step(*args)
+        return _cv.CvImage_step(self)
 
-    def origin(*args):
+    def origin(self):
         """origin(self) -> int"""
-        return _cv.CvImage_origin(*args)
+        return _cv.CvImage_origin(self)
 
-    def roi_row(*args):
+    def roi_row(self, *args):
         """
         roi_row(self, int y) -> uchar
         roi_row(self, int y) -> uchar
         """
-        return _cv.CvImage_roi_row(*args)
+        return _cv.CvImage_roi_row(self, *args)
 
-    def asIplImage(*args):
+    def asIplImage(self):
         """asIplImage(self)"""
-        return _cv.CvImage_asIplImage(*args)
+        return _cv.CvImage_asIplImage(self)
 
 CvImage_swigregister = _cv.CvImage_swigregister
 CvImage_swigregister(CvImage)
@@ -5596,19 +5690,19 @@ class CvMatrix(_object):
         """
         __init__(self) -> CvMatrix
         __init__(self, int rows, int cols, int type) -> CvMatrix
-        __init__(self, int rows, int cols, int type, CvMat hdr, void data=0, 
-            int step=0x7fffffff) -> CvMatrix
-        __init__(self, int rows, int cols, int type, CvMat hdr, void data=0) -> CvMatrix
+        __init__(self, int rows, int cols, int type, CvMat hdr, void data = None, 
+            int step = 0x7fffffff) -> CvMatrix
+        __init__(self, int rows, int cols, int type, CvMat hdr, void data = None) -> CvMatrix
         __init__(self, int rows, int cols, int type, CvMat hdr) -> CvMatrix
         __init__(self, int rows, int cols, int type, CvMemStorage storage, 
-            bool alloc_data=True) -> CvMatrix
+            bool alloc_data = True) -> CvMatrix
         __init__(self, int rows, int cols, int type, CvMemStorage storage) -> CvMatrix
-        __init__(self, int rows, int cols, int type, void data, int step=0x7fffffff) -> CvMatrix
+        __init__(self, int rows, int cols, int type, void data, int step = 0x7fffffff) -> CvMatrix
         __init__(self, int rows, int cols, int type, void data) -> CvMatrix
         __init__(self, CvMat m) -> CvMatrix
         __init__(self, CvMatrix m) -> CvMatrix
-        __init__(self, char filename, char matname=0, int color=-1) -> CvMatrix
-        __init__(self, char filename, char matname=0) -> CvMatrix
+        __init__(self, char filename, char matname = None, int color = -1) -> CvMatrix
+        __init__(self, char filename, char matname = None) -> CvMatrix
         __init__(self, char filename) -> CvMatrix
         __init__(self, CvFileStorage fs, char mapname, char matname) -> CvMatrix
         __init__(self, CvFileStorage fs, char seqname, int idx) -> CvMatrix
@@ -5618,128 +5712,124 @@ class CvMatrix(_object):
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvMatrix
     __del__ = lambda self : None;
-    def clone(*args):
+    def clone(self):
         """clone(self) -> CvMatrix"""
-        return _cv.CvMatrix_clone(*args)
+        return _cv.CvMatrix_clone(self)
 
-    def set(*args):
+    def set(self, *args):
         """set(self, CvMat m, bool add_ref)"""
-        return _cv.CvMatrix_set(*args)
+        return _cv.CvMatrix_set(self, *args)
 
-    def create(*args):
+    def create(self, *args):
         """create(self, int rows, int cols, int type)"""
-        return _cv.CvMatrix_create(*args)
+        return _cv.CvMatrix_create(self, *args)
 
-    def addref(*args):
+    def addref(self):
         """addref(self)"""
-        return _cv.CvMatrix_addref(*args)
+        return _cv.CvMatrix_addref(self)
 
-    def release(*args):
+    def release(self):
         """release(self)"""
-        return _cv.CvMatrix_release(*args)
+        return _cv.CvMatrix_release(self)
 
-    def clear(*args):
+    def clear(self):
         """clear(self)"""
-        return _cv.CvMatrix_clear(*args)
+        return _cv.CvMatrix_clear(self)
 
-    def load(*args):
+    def load(self, *args):
         """
-        load(self, char filename, char matname=0, int color=-1) -> bool
-        load(self, char filename, char matname=0) -> bool
+        load(self, char filename, char matname = None, int color = -1) -> bool
+        load(self, char filename, char matname = None) -> bool
         load(self, char filename) -> bool
         """
-        return _cv.CvMatrix_load(*args)
+        return _cv.CvMatrix_load(self, *args)
 
-    def read(*args):
+    def read(self, *args):
         """
         read(self, CvFileStorage fs, char mapname, char matname) -> bool
         read(self, CvFileStorage fs, char seqname, int idx) -> bool
         """
-        return _cv.CvMatrix_read(*args)
+        return _cv.CvMatrix_read(self, *args)
 
-    def save(*args):
-        """save(self, char filename, char matname)"""
-        return _cv.CvMatrix_save(*args)
+    def save(self, *args):
+        """
+        save(self, char filename, char matname, int params = None)
+        save(self, char filename, char matname)
+        """
+        return _cv.CvMatrix_save(self, *args)
 
-    def write(*args):
+    def write(self, *args):
         """write(self, CvFileStorage fs, char matname)"""
-        return _cv.CvMatrix_write(*args)
+        return _cv.CvMatrix_write(self, *args)
 
-    def show(*args):
+    def show(self, *args):
         """show(self, char window_name)"""
-        return _cv.CvMatrix_show(*args)
+        return _cv.CvMatrix_show(self, *args)
 
-    def is_valid(*args):
+    def is_valid(self):
         """is_valid(self) -> bool"""
-        return _cv.CvMatrix_is_valid(*args)
+        return _cv.CvMatrix_is_valid(self)
 
-    def rows(*args):
+    def rows(self):
         """rows(self) -> int"""
-        return _cv.CvMatrix_rows(*args)
+        return _cv.CvMatrix_rows(self)
 
-    def cols(*args):
+    def cols(self):
         """cols(self) -> int"""
-        return _cv.CvMatrix_cols(*args)
+        return _cv.CvMatrix_cols(self)
 
-    def size(*args):
+    def size(self):
         """size(self) -> CvSize"""
-        return _cv.CvMatrix_size(*args)
+        return _cv.CvMatrix_size(self)
 
-    def type(*args):
+    def type(self):
         """type(self) -> int"""
-        return _cv.CvMatrix_type(*args)
+        return _cv.CvMatrix_type(self)
 
-    def depth(*args):
+    def depth(self):
         """depth(self) -> int"""
-        return _cv.CvMatrix_depth(*args)
+        return _cv.CvMatrix_depth(self)
 
-    def channels(*args):
+    def channels(self):
         """channels(self) -> int"""
-        return _cv.CvMatrix_channels(*args)
+        return _cv.CvMatrix_channels(self)
 
-    def pix_size(*args):
+    def pix_size(self):
         """pix_size(self) -> int"""
-        return _cv.CvMatrix_pix_size(*args)
+        return _cv.CvMatrix_pix_size(self)
 
-    def data(*args):
+    def data(self, *args):
         """
         data(self) -> uchar
         data(self) -> uchar
         """
-        return _cv.CvMatrix_data(*args)
+        return _cv.CvMatrix_data(self, *args)
 
-    def step(*args):
+    def step(self):
         """step(self) -> int"""
-        return _cv.CvMatrix_step(*args)
+        return _cv.CvMatrix_step(self)
 
-    def set_data(*args):
+    def set_data(self, *args):
         """
-        set_data(self, void data, int step=0x7fffffff)
+        set_data(self, void data, int step = 0x7fffffff)
         set_data(self, void data)
         """
-        return _cv.CvMatrix_set_data(*args)
+        return _cv.CvMatrix_set_data(self, *args)
 
-    def row(*args):
+    def row(self, *args):
         """
         row(self, int i) -> uchar
         row(self, int i) -> uchar
         """
-        return _cv.CvMatrix_row(*args)
+        return _cv.CvMatrix_row(self, *args)
 
-    def asCvMat(*args):
+    def asCvMat(self):
         """asCvMat(self) -> CvMat"""
-        return _cv.CvMatrix_asCvMat(*args)
+        return _cv.CvMatrix_asCvMat(self)
 
 CvMatrix_swigregister = _cv.CvMatrix_swigregister
 CvMatrix_swigregister(CvMatrix)
 
-
-def cvSetImageIOFunctions(*args):
-  """
-    cvSetImageIOFunctions(CvLoadImageFunc _load_image, CvLoadImageMFunc _load_image_m, 
-        CvSaveImageFunc _save_image, CvShowImageFunc _show_image) -> int
-    """
-  return _cv.cvSetImageIOFunctions(*args)
 class CvModule(_object):
     """Proxy of C++ CvModule class"""
     __swig_setmethods__ = {}
@@ -5765,6 +5855,7 @@ class CvModule(_object):
     if _newclass:last = _swig_property(_cv.CvModule_last_get, _cv.CvModule_last_set)
 CvModule_swigregister = _cv.CvModule_swigregister
 CvModule_swigregister(CvModule)
+cvar = _cv.cvar
 
 class CvType(_object):
     """Proxy of C++ CvType class"""
@@ -5775,14 +5866,14 @@ class CvType(_object):
     __repr__ = _swig_repr
     def __init__(self, *args): 
         """
-        __init__(self, char type_name, CvIsInstanceFunc is_instance, CvReleaseFunc release=0, 
-            CvReadFunc read=0, CvWriteFunc write=0, 
-            CvCloneFunc clone=0) -> CvType
-        __init__(self, char type_name, CvIsInstanceFunc is_instance, CvReleaseFunc release=0, 
-            CvReadFunc read=0, CvWriteFunc write=0) -> CvType
-        __init__(self, char type_name, CvIsInstanceFunc is_instance, CvReleaseFunc release=0, 
-            CvReadFunc read=0) -> CvType
-        __init__(self, char type_name, CvIsInstanceFunc is_instance, CvReleaseFunc release=0) -> CvType
+        __init__(self, char type_name, CvIsInstanceFunc is_instance, CvReleaseFunc release = 0, 
+            CvReadFunc read = 0, CvWriteFunc write = 0, 
+            CvCloneFunc clone = 0) -> CvType
+        __init__(self, char type_name, CvIsInstanceFunc is_instance, CvReleaseFunc release = 0, 
+            CvReadFunc read = 0, CvWriteFunc write = 0) -> CvType
+        __init__(self, char type_name, CvIsInstanceFunc is_instance, CvReleaseFunc release = 0, 
+            CvReadFunc read = 0) -> CvType
+        __init__(self, char type_name, CvIsInstanceFunc is_instance, CvReleaseFunc release = 0) -> CvType
         __init__(self, char type_name, CvIsInstanceFunc is_instance) -> CvType
         """
         this = _cv.new_CvType(*args)
@@ -5863,9 +5954,9 @@ class CvMoments(_object):
     __swig_setmethods__["inv_sqrt_m00"] = _cv.CvMoments_inv_sqrt_m00_set
     __swig_getmethods__["inv_sqrt_m00"] = _cv.CvMoments_inv_sqrt_m00_get
     if _newclass:inv_sqrt_m00 = _swig_property(_cv.CvMoments_inv_sqrt_m00_get, _cv.CvMoments_inv_sqrt_m00_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvMoments"""
-        this = _cv.new_CvMoments(*args)
+        this = _cv.new_CvMoments()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvMoments
@@ -5901,9 +5992,9 @@ class CvHuMoments(_object):
     __swig_setmethods__["hu7"] = _cv.CvHuMoments_hu7_set
     __swig_getmethods__["hu7"] = _cv.CvHuMoments_hu7_get
     if _newclass:hu7 = _swig_property(_cv.CvHuMoments_hu7_get, _cv.CvHuMoments_hu7_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvHuMoments"""
-        this = _cv.new_CvHuMoments(*args)
+        this = _cv.new_CvHuMoments()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvHuMoments
@@ -5930,9 +6021,9 @@ class CvConnectedComp(_object):
     __swig_setmethods__["contour"] = _cv.CvConnectedComp_contour_set
     __swig_getmethods__["contour"] = _cv.CvConnectedComp_contour_get
     if _newclass:contour = _swig_property(_cv.CvConnectedComp_contour_get, _cv.CvConnectedComp_contour_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvConnectedComp"""
-        this = _cv.new_CvConnectedComp(*args)
+        this = _cv.new_CvConnectedComp()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvConnectedComp
@@ -5980,9 +6071,9 @@ class CvChainPtReader(_object):
     __swig_setmethods__["deltas"] = _cv.CvChainPtReader_deltas_set
     __swig_getmethods__["deltas"] = _cv.CvChainPtReader_deltas_get
     if _newclass:deltas = _swig_property(_cv.CvChainPtReader_deltas_get, _cv.CvChainPtReader_deltas_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvChainPtReader"""
-        this = _cv.new_CvChainPtReader(*args)
+        this = _cv.new_CvChainPtReader()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvChainPtReader
@@ -6045,9 +6136,9 @@ class CvContourTree(_object):
     __swig_setmethods__["p2"] = _cv.CvContourTree_p2_set
     __swig_getmethods__["p2"] = _cv.CvContourTree_p2_get
     if _newclass:p2 = _swig_property(_cv.CvContourTree_p2_get, _cv.CvContourTree_p2_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvContourTree"""
-        this = _cv.new_CvContourTree(*args)
+        this = _cv.new_CvContourTree()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvContourTree
@@ -6074,9 +6165,9 @@ class CvConvexityDefect(_object):
     __swig_setmethods__["depth"] = _cv.CvConvexityDefect_depth_set
     __swig_getmethods__["depth"] = _cv.CvConvexityDefect_depth_get
     if _newclass:depth = _swig_property(_cv.CvConvexityDefect_depth_get, _cv.CvConvexityDefect_depth_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvConvexityDefect"""
-        this = _cv.new_CvConvexityDefect(*args)
+        this = _cv.new_CvConvexityDefect()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvConvexityDefect
@@ -6100,9 +6191,9 @@ class CvQuadEdge2D(_object):
     __swig_setmethods__["next"] = _cv.CvQuadEdge2D_next_set
     __swig_getmethods__["next"] = _cv.CvQuadEdge2D_next_get
     if _newclass:next = _swig_property(_cv.CvQuadEdge2D_next_get, _cv.CvQuadEdge2D_next_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvQuadEdge2D"""
-        this = _cv.new_CvQuadEdge2D(*args)
+        this = _cv.new_CvQuadEdge2D()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvQuadEdge2D
@@ -6126,9 +6217,9 @@ class CvSubdiv2DPoint(_object):
     __swig_setmethods__["pt"] = _cv.CvSubdiv2DPoint_pt_set
     __swig_getmethods__["pt"] = _cv.CvSubdiv2DPoint_pt_get
     if _newclass:pt = _swig_property(_cv.CvSubdiv2DPoint_pt_get, _cv.CvSubdiv2DPoint_pt_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSubdiv2DPoint"""
-        this = _cv.new_CvSubdiv2DPoint(*args)
+        this = _cv.new_CvSubdiv2DPoint()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSubdiv2DPoint
@@ -6209,22 +6300,22 @@ class CvSubdiv2D(_object):
     __swig_setmethods__["edges"] = _cv.CvSubdiv2D_edges_set
     __swig_getmethods__["edges"] = _cv.CvSubdiv2D_edges_get
     if _newclass:edges = _swig_property(_cv.CvSubdiv2D_edges_get, _cv.CvSubdiv2D_edges_set)
-    def typed_edges_get(*args):
+    def typed_edges_get(self):
         """typed_edges_get(self) -> CvSeq_CvQuadEdge2D"""
-        return _cv.CvSubdiv2D_typed_edges_get(*args)
+        return _cv.CvSubdiv2D_typed_edges_get(self)
 
-    def typed_edges_set(*args):
-        """typed_edges_set(self, CvSeq_CvQuadEdge2D ?)"""
-        return _cv.CvSubdiv2D_typed_edges_set(*args)
+    def typed_edges_set(self, *args):
+        """typed_edges_set(self, CvSeq_CvQuadEdge2D arg0)"""
+        return _cv.CvSubdiv2D_typed_edges_set(self, *args)
 
     def __iter__(self):
     	s = CvSeq_QuadEdge2D.cast(self)
     	for i in range(s.total):
     		yield s[i]
 
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSubdiv2D"""
-        this = _cv.new_CvSubdiv2D(*args)
+        this = _cv.new_CvSubdiv2D()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSubdiv2D
@@ -6256,9 +6347,9 @@ class CvMatrix3(_object):
     __swig_setmethods__["m"] = _cv.CvMatrix3_m_set
     __swig_getmethods__["m"] = _cv.CvMatrix3_m_get
     if _newclass:m = _swig_property(_cv.CvMatrix3_m_get, _cv.CvMatrix3_m_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvMatrix3"""
-        this = _cv.new_CvMatrix3(*args)
+        this = _cv.new_CvMatrix3()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvMatrix3
@@ -6272,7 +6363,7 @@ class CvConDensation(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvConDensation, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, CvConDensation, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     __swig_setmethods__["MP"] = _cv.CvConDensation_MP_set
     __swig_getmethods__["MP"] = _cv.CvConDensation_MP_get
@@ -6321,7 +6412,7 @@ class CvKalman(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvKalman, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, CvKalman, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     __swig_setmethods__["MP"] = _cv.CvKalman_MP_set
     __swig_getmethods__["MP"] = _cv.CvKalman_MP_get
@@ -6427,9 +6518,9 @@ class CvHaarFeature(_object):
     if _newclass:tilted = _swig_property(_cv.CvHaarFeature_tilted_get, _cv.CvHaarFeature_tilted_set)
     __swig_getmethods__["rect"] = _cv.CvHaarFeature_rect_get
     if _newclass:rect = _swig_property(_cv.CvHaarFeature_rect_get)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvHaarFeature"""
-        this = _cv.new_CvHaarFeature(*args)
+        this = _cv.new_CvHaarFeature()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvHaarFeature
@@ -6450,9 +6541,9 @@ class CvHaarFeature_rect(_object):
     __swig_setmethods__["weight"] = _cv.CvHaarFeature_rect_weight_set
     __swig_getmethods__["weight"] = _cv.CvHaarFeature_rect_weight_get
     if _newclass:weight = _swig_property(_cv.CvHaarFeature_rect_weight_get, _cv.CvHaarFeature_rect_weight_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvHaarFeature_rect"""
-        this = _cv.new_CvHaarFeature_rect(*args)
+        this = _cv.new_CvHaarFeature_rect()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvHaarFeature_rect
@@ -6485,9 +6576,9 @@ class CvHaarClassifier(_object):
     __swig_setmethods__["alpha"] = _cv.CvHaarClassifier_alpha_set
     __swig_getmethods__["alpha"] = _cv.CvHaarClassifier_alpha_get
     if _newclass:alpha = _swig_property(_cv.CvHaarClassifier_alpha_get, _cv.CvHaarClassifier_alpha_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvHaarClassifier"""
-        this = _cv.new_CvHaarClassifier(*args)
+        this = _cv.new_CvHaarClassifier()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvHaarClassifier
@@ -6520,9 +6611,9 @@ class CvHaarStageClassifier(_object):
     __swig_setmethods__["parent"] = _cv.CvHaarStageClassifier_parent_set
     __swig_getmethods__["parent"] = _cv.CvHaarStageClassifier_parent_get
     if _newclass:parent = _swig_property(_cv.CvHaarStageClassifier_parent_get, _cv.CvHaarStageClassifier_parent_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvHaarStageClassifier"""
-        this = _cv.new_CvHaarStageClassifier(*args)
+        this = _cv.new_CvHaarStageClassifier()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvHaarStageClassifier
@@ -6536,7 +6627,7 @@ class CvHaarClassifierCascade(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvHaarClassifierCascade, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, CvHaarClassifierCascade, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     __swig_setmethods__["flags"] = _cv.CvHaarClassifierCascade_flags_set
     __swig_getmethods__["flags"] = _cv.CvHaarClassifierCascade_flags_get
@@ -6577,9 +6668,9 @@ class CvAvgComp(_object):
     __swig_setmethods__["neighbors"] = _cv.CvAvgComp_neighbors_set
     __swig_getmethods__["neighbors"] = _cv.CvAvgComp_neighbors_get
     if _newclass:neighbors = _swig_property(_cv.CvAvgComp_neighbors_get, _cv.CvAvgComp_neighbors_set)
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvAvgComp"""
-        this = _cv.new_CvAvgComp(*args)
+        this = _cv.new_CvAvgComp()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvAvgComp
@@ -6591,37 +6682,38 @@ CvAvgComp_swigregister(CvAvgComp)
 def cvCopyMakeBorder(*args):
   """
     cvCopyMakeBorder(CvArr src, CvArr dst, CvPoint offset, int bordertype, 
-        CvScalar value=cvScalarAll(0))
+        CvScalar value = cvScalarAll(0))
     """
   return _cv.cvCopyMakeBorder(*args)
 
 def cvSmooth(*args):
   """
-    cvSmooth(CvArr src, CvArr dst, int smoothtype=2, int size1=3, 
-        int size2=0, double sigma1=0, double sigma2=0)
+    cvSmooth(CvArr src, CvArr dst, int smoothtype = 2, int size1 = 3, 
+        int size2 = 0, double sigma1 = 0, double sigma2 = 0)
     """
   return _cv.cvSmooth(*args)
 
 def cvFilter2D(*args):
-  """cvFilter2D(CvArr src, CvArr dst, CvMat kernel, CvPoint anchor=cvPoint(-1,-1))"""
+  """cvFilter2D(CvArr src, CvArr dst, CvMat kernel, CvPoint anchor = cvPoint(-1,-1))"""
   return _cv.cvFilter2D(*args)
 
 def cvIntegral(*args):
-  """cvIntegral(CvArr image, CvArr sum, CvArr sqsum=None, CvArr tilted_sum=None)"""
+  """cvIntegral(CvArr image, CvArr sum, CvArr sqsum = None, CvArr tilted_sum = None)"""
   return _cv.cvIntegral(*args)
 
 def cvPyrDown(*args):
-  """cvPyrDown(CvArr src, CvArr dst, int filter=CV_GAUSSIAN_5x5)"""
+  """cvPyrDown(CvArr src, CvArr dst, int filter = CV_GAUSSIAN_5x5)"""
   return _cv.cvPyrDown(*args)
 
 def cvPyrUp(*args):
-  """cvPyrUp(CvArr src, CvArr dst, int filter=CV_GAUSSIAN_5x5)"""
+  """cvPyrUp(CvArr src, CvArr dst, int filter = CV_GAUSSIAN_5x5)"""
   return _cv.cvPyrUp(*args)
 
 def cvCreatePyramid(*args):
   """
-    cvCreatePyramid(CvArr img, int extra_layers, double rate, CvSize layer_sizes=0, 
-        CvArr bufarr=0, int calc=1, int filter=CV_GAUSSIAN_5x5) -> CvMat
+    cvCreatePyramid(CvArr img, int extra_layers, double rate, CvSize layer_sizes = None, 
+        CvArr bufarr = None, int calc = 1, 
+        int filter = CV_GAUSSIAN_5x5) -> CvMat
     """
   return _cv.cvCreatePyramid(*args)
 
@@ -6631,15 +6723,15 @@ def cvReleasePyramid(*args):
 
 def cvPyrSegmentationUntyped(*args):
   """
-    cvPyrSegmentationUntyped( src,  dst, CvMemStorage storage, CvSeq comp, int level, 
-        double threshold1, double threshold2)
+    cvPyrSegmentationUntyped( src,  dst, CvMemStorage storage, int level, double threshold1, 
+        double threshold2)
     """
   return _cv.cvPyrSegmentationUntyped(*args)
 
 def cvPyrMeanShiftFiltering(*args):
   """
-    cvPyrMeanShiftFiltering(CvArr src, CvArr dst, double sp, double sr, int max_level=1, 
-        CvTermCriteria termcrit=cvTermCriteria(1 +2,5,1))
+    cvPyrMeanShiftFiltering(CvArr src, CvArr dst, double sp, double sr, int max_level = 1, 
+        CvTermCriteria termcrit = cvTermCriteria(1 +2,5,1))
     """
   return _cv.cvPyrMeanShiftFiltering(*args)
 
@@ -6655,11 +6747,11 @@ def cvInpaint(*args):
   return _cv.cvInpaint(*args)
 
 def cvSobel(*args):
-  """cvSobel(CvArr src, CvArr dst, int xorder, int yorder, int aperture_size=3)"""
+  """cvSobel(CvArr src, CvArr dst, int xorder, int yorder, int aperture_size = 3)"""
   return _cv.cvSobel(*args)
 
 def cvLaplace(*args):
-  """cvLaplace(CvArr src, CvArr dst, int aperture_size=3)"""
+  """cvLaplace(CvArr src, CvArr dst, int aperture_size = 3)"""
   return _cv.cvLaplace(*args)
 
 def cvCvtColor(*args):
@@ -6667,13 +6759,13 @@ def cvCvtColor(*args):
   return _cv.cvCvtColor(*args)
 
 def cvResize(*args):
-  """cvResize(CvArr src, CvArr dst, int interpolation=1)"""
+  """cvResize(CvArr src, CvArr dst, int interpolation = 1)"""
   return _cv.cvResize(*args)
 
 def cvWarpAffine(*args):
   """
-    cvWarpAffine(CvArr src, CvArr dst, CvMat map_matrix, int flags=1+8, 
-        CvScalar fillval=cvScalarAll(0))
+    cvWarpAffine(CvArr src, CvArr dst, CvMat map_matrix, int flags = 1+8, 
+        CvScalar fillval = cvScalarAll(0))
     """
   return _cv.cvWarpAffine(*args)
 
@@ -6687,8 +6779,8 @@ def cv2DRotationMatrix(*args):
 
 def cvWarpPerspective(*args):
   """
-    cvWarpPerspective(CvArr src, CvArr dst, CvMat map_matrix, int flags=1+8, 
-        CvScalar fillval=cvScalarAll(0))
+    cvWarpPerspective(CvArr src, CvArr dst, CvMat map_matrix, int flags = 1+8, 
+        CvScalar fillval = cvScalarAll(0))
     """
   return _cv.cvWarpPerspective(*args)
 
@@ -6698,42 +6790,53 @@ def cvGetPerspectiveTransform(*args):
 
 def cvRemap(*args):
   """
-    cvRemap(CvArr src, CvArr dst, CvArr mapx, CvArr mapy, int flags=1+8, 
-        CvScalar fillval=cvScalarAll(0))
+    cvRemap(CvArr src, CvArr dst, CvArr mapx, CvArr mapy, int flags = 1+8, 
+        CvScalar fillval = cvScalarAll(0))
     """
   return _cv.cvRemap(*args)
 
+def cvConvertMaps(*args):
+  """cvConvertMaps(CvArr mapx, CvArr mapy, CvArr mapxy, CvArr mapalpha)"""
+  return _cv.cvConvertMaps(*args)
+
 def cvLogPolar(*args):
   """
     cvLogPolar(CvArr src, CvArr dst, CvPoint2D32f center, double M, 
-        int flags=1+8)
+        int flags = 1+8)
     """
   return _cv.cvLogPolar(*args)
 
+def cvLinearPolar(*args):
+  """
+    cvLinearPolar(CvArr src, CvArr dst, CvPoint2D32f center, double maxRadius, 
+        int flags = 1+8)
+    """
+  return _cv.cvLinearPolar(*args)
+
 def cvCreateStructuringElementEx(*args):
   """
     cvCreateStructuringElementEx(int cols, int rows, int anchor_x, int anchor_y, int shape, 
-        int values=None)
+        int values = None)
     """
   return _cv.cvCreateStructuringElementEx(*args)
 
 def cvErode(*args):
-  """cvErode(CvArr src, CvArr dst,  element=None, int iterations=1)"""
+  """cvErode(CvArr src, CvArr dst,  element = None, int iterations = 1)"""
   return _cv.cvErode(*args)
 
 def cvDilate(*args):
-  """cvDilate(CvArr src, CvArr dst,  element=None, int iterations=1)"""
+  """cvDilate(CvArr src, CvArr dst,  element = None, int iterations = 1)"""
   return _cv.cvDilate(*args)
 
 def cvMorphologyEx(*args):
   """
     cvMorphologyEx(CvArr src, CvArr dst, CvArr temp,  element, int operation, 
-        int iterations=1)
+        int iterations = 1)
     """
   return _cv.cvMorphologyEx(*args)
 
 def cvMoments(*args):
-  """cvMoments(CvArr arr, CvMoments moments, int binary=0)"""
+  """cvMoments(CvArr arr, CvMoments moments, int binary = 0)"""
   return _cv.cvMoments(*args)
 
 def cvGetSpatialMoment(*args):
@@ -6755,7 +6858,7 @@ def cvGetHuMoments(*args):
 def cvSampleLine(*args):
   """
     cvSampleLine(CvArr image, CvPoint pt1, CvPoint pt2, void buffer, 
-        int connectivity=8) -> int
+        int connectivity = 8) -> int
     """
   return _cv.cvSampleLine(*args)
 
@@ -6774,25 +6877,25 @@ def cvMatchTemplate(*args):
 def cvCalcEMD2(*args):
   """
     cvCalcEMD2(CvArr signature1, CvArr signature2, int distance_type, 
-        CvDistanceFunction distance_func=None, CvArr cost_matrix=None, 
-        CvArr flow=None, float lower_bound=None, 
-        void userdata=None) -> float
+        CvDistanceFunction distance_func = None, 
+        CvArr cost_matrix = None, CvArr flow = None, 
+        float lower_bound = None, void userdata = None) -> float
     """
   return _cv.cvCalcEMD2(*args)
 
 def cvFindContoursUntyped(*args):
   """
-    cvFindContoursUntyped(CvArr image, CvMemStorage storage, CvSeq first_contour, 
-        int header_size=sizeof(CvContour), int mode=1, 
-        int method=2, CvPoint offset=cvPoint(0,0)) -> int
+    cvFindContoursUntyped(CvArr image, CvMemStorage storage, int header_size = sizeof(CvContour), 
+        int mode = 1, int method = 2, 
+        CvPoint offset = cvPoint(0,0)) -> int
     """
   return _cv.cvFindContoursUntyped(*args)
 
 def cvStartFindContours(*args):
   """
-    cvStartFindContours(CvArr image, CvMemStorage storage, int header_size=sizeof(CvContour), 
-        int mode=1, int method=2, 
-        CvPoint offset=cvPoint(0,0)) -> CvContourScanner
+    cvStartFindContours(CvArr image, CvMemStorage storage, int header_size = sizeof(CvContour), 
+        int mode = 1, int method = 2, 
+        CvPoint offset = cvPoint(0,0)) -> CvContourScanner
     """
   return _cv.cvStartFindContours(*args)
 
@@ -6810,9 +6913,9 @@ def cvEndFindContours(*args):
 
 def cvApproxChainsUntyped(*args):
   """
-    cvApproxChainsUntyped(CvSeq src_seq, CvMemStorage storage, int method=2, 
-        double parameter=0, int minimal_perimeter=0, 
-        int recursive=0) -> CvSeq
+    cvApproxChainsUntyped(CvSeq src_seq, CvMemStorage storage, int method = 2, 
+        double parameter = 0, int minimal_perimeter = 0, 
+        int recursive = 0) -> CvSeq
     """
   return _cv.cvApproxChainsUntyped(*args)
 
@@ -6842,7 +6945,7 @@ def cvCalcOpticalFlowBM(*args):
 def cvCalcOpticalFlowHS(*args):
   """
     cvCalcOpticalFlowHS(CvArr prev, CvArr curr, int use_previous, CvArr velx, 
-        CvArr vely, double lambda, CvTermCriteria criteria)
+        CvArr vely, double _lambda, CvTermCriteria criteria)
     """
   return _cv.cvCalcOpticalFlowHS(*args)
 
@@ -6877,7 +6980,7 @@ def cvUpdateMotionHistory(*args):
 def cvCalcMotionGradient(*args):
   """
     cvCalcMotionGradient(CvArr mhi, CvArr mask, CvArr orientation, double delta1, 
-        double delta2, int aperture_size=3)
+        double delta2, int aperture_size = 3)
     """
   return _cv.cvCalcMotionGradient(*args)
 
@@ -6889,25 +6992,25 @@ def cvCalcGlobalOrientation(*args):
   return _cv.cvCalcGlobalOrientation(*args)
 
 def cvAcc(*args):
-  """cvAcc(CvArr image, CvArr sum, CvArr mask=None)"""
+  """cvAcc(CvArr image, CvArr sum, CvArr mask = None)"""
   return _cv.cvAcc(*args)
 
 def cvSquareAcc(*args):
-  """cvSquareAcc(CvArr image, CvArr sqsum, CvArr mask=None)"""
+  """cvSquareAcc(CvArr image, CvArr sqsum, CvArr mask = None)"""
   return _cv.cvSquareAcc(*args)
 
 def cvMultiplyAcc(*args):
-  """cvMultiplyAcc(CvArr image1, CvArr image2, CvArr acc, CvArr mask=None)"""
+  """cvMultiplyAcc(CvArr image1, CvArr image2, CvArr acc, CvArr mask = None)"""
   return _cv.cvMultiplyAcc(*args)
 
 def cvRunningAvg(*args):
-  """cvRunningAvg(CvArr image, CvArr acc, double alpha, CvArr mask=None)"""
+  """cvRunningAvg(CvArr image, CvArr acc, double alpha, CvArr mask = None)"""
   return _cv.cvRunningAvg(*args)
 
 def cvCamShift(*args):
   """
     cvCamShift(CvArr prob_image, CvRect window, CvTermCriteria criteria, 
-        CvConnectedComp comp, CvBox2D box=None) -> int
+        CvConnectedComp comp, CvBox2D box = None) -> int
     """
   return _cv.cvCamShift(*args)
 
@@ -6931,11 +7034,11 @@ def cvConDensInitSampleSet(*args):
   return _cv.cvConDensInitSampleSet(*args)
 
 def cvCreateKalman(*args):
-  """cvCreateKalman(int dynam_params, int measure_params, int control_params=0) -> CvKalman"""
+  """cvCreateKalman(int dynam_params, int measure_params, int control_params = 0) -> CvKalman"""
   return _cv.cvCreateKalman(*args)
 
 def cvKalmanPredict(*args):
-  """cvKalmanPredict(CvKalman kalman, CvMat control=None) -> CvMat"""
+  """cvKalmanPredict(CvKalman kalman, CvMat control = None) -> CvMat"""
   return _cv.cvKalmanPredict(*args)
 
 def cvKalmanCorrect(*args):
@@ -6962,7 +7065,7 @@ def cvSubdivDelaunay2DInsert(*args):
   return _cv.cvSubdivDelaunay2DInsert(*args)
 
 def cvSubdiv2DLocate(*args):
-  """cvSubdiv2DLocate(CvSubdiv2D subdiv, CvPoint2D32f pt, CvSubdiv2DEdge edge) -> CvSubdiv2DPointLocation"""
+  """cvSubdiv2DLocate(CvSubdiv2D subdiv, CvPoint2D32f pt) -> CvSubdiv2DPointLocation"""
   return _cv.cvSubdiv2DLocate(*args)
 
 def cvCalcSubdivVoronoi2D(*args):
@@ -7007,30 +7110,37 @@ def cvTriangleArea(*args):
 
 def cvFindDominantPoints(*args):
   """
-    cvFindDominantPoints(CvSeq contour, CvMemStorage storage, int method=1, 
-        double parameter1=0, double parameter2=0, double parameter3=0, 
-        double parameter4=0) -> CvSeq
+    cvFindDominantPoints(CvSeq contour, CvMemStorage storage, int method = 1, 
+        double parameter1 = 0, double parameter2 = 0, 
+        double parameter3 = 0, double parameter4 = 0) -> CvSeq
     """
   return _cv.cvFindDominantPoints(*args)
 
+def cvArcLength(*args):
+  """
+    cvArcLength(void curve, CvSlice slice = cvSlice(0, 0x3fffffff), 
+        int is_closed = -1) -> double
+    """
+  return _cv.cvArcLength(*args)
+
 def cvBoundingRect(*args):
-  """cvBoundingRect(CvArr points, int update=0) -> CvRect"""
+  """cvBoundingRect(CvArr points, int update = 0) -> CvRect"""
   return _cv.cvBoundingRect(*args)
 
 def cvContourArea(*args):
-  """cvContourArea(CvArr contour, CvSlice slice=cvSlice(0, 0x3fffffff)) -> double"""
+  """cvContourArea(CvArr contour, CvSlice slice = cvSlice(0, 0x3fffffff)) -> double"""
   return _cv.cvContourArea(*args)
 
 def cvMinAreaRect2(*args):
-  """cvMinAreaRect2(CvArr points, CvMemStorage storage=None) -> CvBox2D"""
+  """cvMinAreaRect2(CvArr points, CvMemStorage storage = None) -> CvBox2D"""
   return _cv.cvMinAreaRect2(*args)
 
 def cvMinEnclosingCircle(*args):
-  """cvMinEnclosingCircle(CvArr points, CvPoint2D32f center) -> int"""
+  """cvMinEnclosingCircle(CvArr points) -> int"""
   return _cv.cvMinEnclosingCircle(*args)
 
 def cvMatchShapes(*args):
-  """cvMatchShapes(void object1, void object2, int method, double parameter=0) -> double"""
+  """cvMatchShapes(void object1, void object2, int method, double parameter = 0) -> double"""
   return _cv.cvMatchShapes(*args)
 
 def cvCreateContourTree(*args):
@@ -7057,7 +7167,7 @@ def cvCheckContourConvexity(*args):
   return _cv.cvCheckContourConvexity(*args)
 
 def cvConvexityDefectsUntyped(*args):
-  """cvConvexityDefectsUntyped(CvArr contour, CvArr convexhull, CvMemStorage storage=None) -> CvSeq"""
+  """cvConvexityDefectsUntyped(CvArr contour, CvArr convexhull, CvMemStorage storage = None) -> CvSeq"""
   return _cv.cvConvexityDefectsUntyped(*args)
 
 def cvFitEllipse2(*args):
@@ -7069,7 +7179,7 @@ def cvMaxRect(*args):
   return _cv.cvMaxRect(*args)
 
 def cvBoxPoints(*args):
-  """cvBoxPoints(CvBox2D box, CvPoint2D32f pt)"""
+  """cvBoxPoints(CvBox2D box)"""
   return _cv.cvBoxPoints(*args)
 
 def cvPointSeqFromMat(*args):
@@ -7084,17 +7194,17 @@ def cvPointPolygonTest(*args):
   return _cv.cvPointPolygonTest(*args)
 
 def cvCreateHist(*args):
-  """cvCreateHist(int dims, int type, float ranges=None, int uniform=1) -> CvHistogram"""
+  """cvCreateHist(int dims, int type, float ranges = None, int uniform = 1) -> CvHistogram"""
   return _cv.cvCreateHist(*args)
 
 def cvSetHistBinRanges(*args):
-  """cvSetHistBinRanges(CvHistogram hist, float ranges, int uniform=1)"""
+  """cvSetHistBinRanges(CvHistogram hist, float ranges, int uniform = 1)"""
   return _cv.cvSetHistBinRanges(*args)
 
 def cvMakeHistHeaderForArray(*args):
   """
-    cvMakeHistHeaderForArray(int dims, CvHistogram hist, float data, float ranges=None, 
-        int uniform=1) -> CvHistogram
+    cvMakeHistHeaderForArray(int dims, CvHistogram hist, float data, float ranges = None, 
+        int uniform = 1) -> CvHistogram
     """
   return _cv.cvMakeHistHeaderForArray(*args)
 
@@ -7103,10 +7213,7 @@ def cvClearHist(*args):
   return _cv.cvClearHist(*args)
 
 def cvGetMinMaxHistValue(*args):
-  """
-    cvGetMinMaxHistValue(CvHistogram hist, float min_value, float max_value, 
-        int min_idx=None, int max_idx=None)
-    """
+  """cvGetMinMaxHistValue(CvHistogram hist)"""
   return _cv.cvGetMinMaxHistValue(*args)
 
 def cvNormalizeHist(*args):
@@ -7130,12 +7237,12 @@ def cvCalcBayesianProb(*args):
   return _cv.cvCalcBayesianProb(*args)
 
 def cvCalcArrHist(*args):
-  """cvCalcArrHist(CvArr arr, CvHistogram hist, int accumulate=0, CvArr mask=None)"""
+  """cvCalcArrHist(CvArr arr, CvHistogram hist, int accumulate = 0, CvArr mask = None)"""
   return _cv.cvCalcArrHist(*args)
 
-def cvCalcImageHist(*args):
-  """cvCalcImageHist( image, CvHistogram hist, int accumulate=0, CvArr mask=None)"""
-  return _cv.cvCalcImageHist(*args)
+def cvCalcHist(*args):
+  """cvCalcHist( image, CvHistogram hist, int accumulate = 0, CvArr mask = None)"""
+  return _cv.cvCalcHist(*args)
 
 def cvCalcArrBackProject(*args):
   """cvCalcArrBackProject(CvArr image, CvArr dst, CvHistogram hist)"""
@@ -7151,7 +7258,7 @@ def cvCalcArrBackProjectPatch(*args):
 def cvCalcProbDensity(*args):
   """
     cvCalcProbDensity(CvHistogram hist1, CvHistogram hist2, CvHistogram dst_hist, 
-        double scale=255)
+        double scale = 255)
     """
   return _cv.cvCalcProbDensity(*args)
 
@@ -7165,8 +7272,8 @@ def cvCalcImageHomography(*args):
 
 def cvDistTransform(*args):
   """
-    cvDistTransform(CvArr src, CvArr dst, int distance_type=2, int mask_size=3, 
-        float mask=None, CvArr labels=None)
+    cvDistTransform(CvArr src, CvArr dst, int distance_type = 2, int mask_size = 3, 
+        float mask = None, CvArr labels = None)
     """
   return _cv.cvDistTransform(*args)
 
@@ -7179,44 +7286,44 @@ def cvThreshold(*args):
 
 def cvAdaptiveThreshold(*args):
   """
-    cvAdaptiveThreshold(CvArr src, CvArr dst, double max_value, int adaptive_method=0, 
-        int threshold_type=0, int block_size=3, 
-        double param1=5)
+    cvAdaptiveThreshold(CvArr src, CvArr dst, double max_value, int adaptive_method = 0, 
+        int threshold_type = 0, int block_size = 3, 
+        double param1 = 5)
     """
   return _cv.cvAdaptiveThreshold(*args)
 
 def cvFloodFill(*args):
   """
     cvFloodFill(CvArr image, CvPoint seed_point, CvScalar new_val, 
-        CvScalar lo_diff=cvScalarAll(0), CvScalar up_diff=cvScalarAll(0), 
-        CvConnectedComp comp=None, 
-        int flags=4, CvArr mask=None)
+        CvScalar lo_diff = cvScalarAll(0), CvScalar up_diff = cvScalarAll(0), 
+        CvConnectedComp comp = None, 
+        int flags = 4, CvArr mask = None)
     """
   return _cv.cvFloodFill(*args)
 
 def cvCanny(*args):
   """
     cvCanny(CvArr image, CvArr edges, double threshold1, double threshold2, 
-        int aperture_size=3)
+        int aperture_size = 3)
     """
   return _cv.cvCanny(*args)
 
 def cvPreCornerDetect(*args):
-  """cvPreCornerDetect(CvArr image, CvArr corners, int aperture_size=3)"""
+  """cvPreCornerDetect(CvArr image, CvArr corners, int aperture_size = 3)"""
   return _cv.cvPreCornerDetect(*args)
 
 def cvCornerEigenValsAndVecs(*args):
-  """cvCornerEigenValsAndVecs(CvArr image, CvArr eigenvv, int block_size, int aperture_size=3)"""
+  """cvCornerEigenValsAndVecs(CvArr image, CvArr eigenvv, int block_size, int aperture_size = 3)"""
   return _cv.cvCornerEigenValsAndVecs(*args)
 
 def cvCornerMinEigenVal(*args):
-  """cvCornerMinEigenVal(CvArr image, CvArr eigenval, int block_size, int aperture_size=3)"""
+  """cvCornerMinEigenVal(CvArr image, CvArr eigenval, int block_size, int aperture_size = 3)"""
   return _cv.cvCornerMinEigenVal(*args)
 
 def cvCornerHarris(*args):
   """
     cvCornerHarris(CvArr image, CvArr harris_responce, int block_size, 
-        int aperture_size=3, double k=0.04)
+        int aperture_size = 3, double k = 0.04)
     """
   return _cv.cvCornerHarris(*args)
 
@@ -7231,24 +7338,24 @@ def cvGoodFeaturesToTrack(*args):
   """
     cvGoodFeaturesToTrack(CvArr image, CvArr eig_image, CvArr temp_image, CvPoint2D32f corners, 
         double quality_level, double min_distance, 
-        CvArr mask=None, int block_size=3, 
-        int use_harris=0, double k=0.04)
+        CvArr mask = None, int block_size = 3, 
+        int use_harris = 0, double k = 0.04)
     """
   return _cv.cvGoodFeaturesToTrack(*args)
 
 def cvHoughLinesUntyped(*args):
   """
     cvHoughLinesUntyped(CvArr image, void line_storage, int method, double rho, 
-        double theta, int threshold, double param1=0, 
-        double param2=0) -> CvSeq
+        double theta, int threshold, double param1 = 0, 
+        double param2 = 0) -> CvSeq
     """
   return _cv.cvHoughLinesUntyped(*args)
 
 def cvHoughCirclesUntyped(*args):
   """
     cvHoughCirclesUntyped(CvArr image, void circle_storage, int method, double dp, 
-        double min_dist, double param1=100, double param2=100, 
-        int min_radius=0, int max_radius=0) -> CvSeq
+        double min_dist, double param1 = 100, double param2 = 100, 
+        int min_radius = 0, int max_radius = 0) -> CvSeq
     """
   return _cv.cvHoughCirclesUntyped(*args)
 
@@ -7259,9 +7366,13 @@ def cvFitLine(*args):
     """
   return _cv.cvFitLine(*args)
 
-def cvCreateFeatureTree(*args):
-  """cvCreateFeatureTree(CvMat desc) -> CvFeatureTree"""
-  return _cv.cvCreateFeatureTree(*args)
+def cvCreateKDTree(*args):
+  """cvCreateKDTree(CvMat desc) -> CvFeatureTree"""
+  return _cv.cvCreateKDTree(*args)
+
+def cvCreateSpillTree(*args):
+  """cvCreateSpillTree(CvMat raw_data, int naive = 50, double rho = .7, double tau = .1) -> CvFeatureTree"""
+  return _cv.cvCreateSpillTree(*args)
 
 def cvReleaseFeatureTree(*args):
   """cvReleaseFeatureTree(CvFeatureTree tr)"""
@@ -7269,18 +7380,267 @@ def cvReleaseFeatureTree(*args):
 
 def cvFindFeatures(*args):
   """
-    cvFindFeatures(CvFeatureTree tr, CvMat desc, CvMat results, CvMat dist, 
-        int k=2, int emax=20)
+    cvFindFeatures(CvFeatureTree tr, CvMat query_points, CvMat indices, 
+        int emax = 20)
     """
   return _cv.cvFindFeatures(*args)
 
 def cvFindFeaturesBoxed(*args):
   """
     cvFindFeaturesBoxed(CvFeatureTree tr, CvMat bounds_min, CvMat bounds_max, 
-        CvMat results) -> int
+        CvMat out_indices) -> int
     """
   return _cv.cvFindFeaturesBoxed(*args)
 
+def cvCreateLSH(*args):
+  """
+    cvCreateLSH(CvLSHOperations ops, int d, int L = 10, int k = 10, 
+        int type = (((6) &((1 << 3) -1)) +(((1) -1) << 3)), 
+        double r = 4, int64 seed = -1) -> CvLSH
+    """
+  return _cv.cvCreateLSH(*args)
+
+def cvCreateMemoryLSH(*args):
+  """
+    cvCreateMemoryLSH(int d, int n, int L = 10, int k = 10, int type = (((6) &((1 << 3) -1)) +(((1) -1) << 3)), 
+        double r = 4, 
+        int64 seed = -1) -> CvLSH
+    """
+  return _cv.cvCreateMemoryLSH(*args)
+
+def cvReleaseLSH(*args):
+  """cvReleaseLSH(CvLSH lsh)"""
+  return _cv.cvReleaseLSH(*args)
+
+def LSHSize(*args):
+  """LSHSize(CvLSH lsh) -> unsigned int"""
+  return _cv.LSHSize(*args)
+
+def cvLSHAdd(*args):
+  """cvLSHAdd(CvLSH lsh, CvMat data)"""
+  return _cv.cvLSHAdd(*args)
+
+def cvLSHRemove(*args):
+  """cvLSHRemove(CvLSH lsh, CvMat indices)"""
+  return _cv.cvLSHRemove(*args)
+
+def cvLSHQuery(*args):
+  """cvLSHQuery(CvLSH lsh, CvMat query_points, CvMat indices, int emax)"""
+  return _cv.cvLSHQuery(*args)
+class CvSURFPoint(_object):
+    """Proxy of C++ CvSURFPoint class"""
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, CvSURFPoint, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, CvSURFPoint, name)
+    __repr__ = _swig_repr
+    __swig_setmethods__["pt"] = _cv.CvSURFPoint_pt_set
+    __swig_getmethods__["pt"] = _cv.CvSURFPoint_pt_get
+    if _newclass:pt = _swig_property(_cv.CvSURFPoint_pt_get, _cv.CvSURFPoint_pt_set)
+    __swig_setmethods__["laplacian"] = _cv.CvSURFPoint_laplacian_set
+    __swig_getmethods__["laplacian"] = _cv.CvSURFPoint_laplacian_get
+    if _newclass:laplacian = _swig_property(_cv.CvSURFPoint_laplacian_get, _cv.CvSURFPoint_laplacian_set)
+    __swig_setmethods__["size"] = _cv.CvSURFPoint_size_set
+    __swig_getmethods__["size"] = _cv.CvSURFPoint_size_get
+    if _newclass:size = _swig_property(_cv.CvSURFPoint_size_get, _cv.CvSURFPoint_size_set)
+    __swig_setmethods__["dir"] = _cv.CvSURFPoint_dir_set
+    __swig_getmethods__["dir"] = _cv.CvSURFPoint_dir_get
+    if _newclass:dir = _swig_property(_cv.CvSURFPoint_dir_get, _cv.CvSURFPoint_dir_set)
+    __swig_setmethods__["hessian"] = _cv.CvSURFPoint_hessian_set
+    __swig_getmethods__["hessian"] = _cv.CvSURFPoint_hessian_get
+    if _newclass:hessian = _swig_property(_cv.CvSURFPoint_hessian_get, _cv.CvSURFPoint_hessian_set)
+    def __init__(self): 
+        """__init__(self) -> CvSURFPoint"""
+        this = _cv.new_CvSURFPoint()
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _cv.delete_CvSURFPoint
+    __del__ = lambda self : None;
+CvSURFPoint_swigregister = _cv.CvSURFPoint_swigregister
+CvSURFPoint_swigregister(CvSURFPoint)
+
+
+def cvSURFPoint(*args):
+  """
+    cvSURFPoint(CvPoint2D32f pt, int laplacian, int size, float dir = 0, 
+        float hessian = 0) -> CvSURFPoint
+    """
+  return _cv.cvSURFPoint(*args)
+class CvSURFParams(_object):
+    """Proxy of C++ CvSURFParams class"""
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, CvSURFParams, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, CvSURFParams, name)
+    __repr__ = _swig_repr
+    __swig_setmethods__["extended"] = _cv.CvSURFParams_extended_set
+    __swig_getmethods__["extended"] = _cv.CvSURFParams_extended_get
+    if _newclass:extended = _swig_property(_cv.CvSURFParams_extended_get, _cv.CvSURFParams_extended_set)
+    __swig_setmethods__["hessianThreshold"] = _cv.CvSURFParams_hessianThreshold_set
+    __swig_getmethods__["hessianThreshold"] = _cv.CvSURFParams_hessianThreshold_get
+    if _newclass:hessianThreshold = _swig_property(_cv.CvSURFParams_hessianThreshold_get, _cv.CvSURFParams_hessianThreshold_set)
+    __swig_setmethods__["nOctaves"] = _cv.CvSURFParams_nOctaves_set
+    __swig_getmethods__["nOctaves"] = _cv.CvSURFParams_nOctaves_get
+    if _newclass:nOctaves = _swig_property(_cv.CvSURFParams_nOctaves_get, _cv.CvSURFParams_nOctaves_set)
+    __swig_setmethods__["nOctaveLayers"] = _cv.CvSURFParams_nOctaveLayers_set
+    __swig_getmethods__["nOctaveLayers"] = _cv.CvSURFParams_nOctaveLayers_get
+    if _newclass:nOctaveLayers = _swig_property(_cv.CvSURFParams_nOctaveLayers_get, _cv.CvSURFParams_nOctaveLayers_set)
+    def __init__(self): 
+        """__init__(self) -> CvSURFParams"""
+        this = _cv.new_CvSURFParams()
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _cv.delete_CvSURFParams
+    __del__ = lambda self : None;
+CvSURFParams_swigregister = _cv.CvSURFParams_swigregister
+CvSURFParams_swigregister(CvSURFParams)
+
+
+def cvSURFParams(*args):
+  """cvSURFParams(double hessianThreshold, int extended = 0) -> CvSURFParams"""
+  return _cv.cvSURFParams(*args)
+
+def cvExtractSURF(*args):
+  """cvExtractSURF(CvArr img, CvArr mask, CvSURFParams params, int useProvidedKeyPts = 0)"""
+  return _cv.cvExtractSURF(*args)
+class CvMSERParams(_object):
+    """Proxy of C++ CvMSERParams class"""
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, CvMSERParams, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, CvMSERParams, name)
+    __repr__ = _swig_repr
+    __swig_setmethods__["delta"] = _cv.CvMSERParams_delta_set
+    __swig_getmethods__["delta"] = _cv.CvMSERParams_delta_get
+    if _newclass:delta = _swig_property(_cv.CvMSERParams_delta_get, _cv.CvMSERParams_delta_set)
+    __swig_setmethods__["maxArea"] = _cv.CvMSERParams_maxArea_set
+    __swig_getmethods__["maxArea"] = _cv.CvMSERParams_maxArea_get
+    if _newclass:maxArea = _swig_property(_cv.CvMSERParams_maxArea_get, _cv.CvMSERParams_maxArea_set)
+    __swig_setmethods__["minArea"] = _cv.CvMSERParams_minArea_set
+    __swig_getmethods__["minArea"] = _cv.CvMSERParams_minArea_get
+    if _newclass:minArea = _swig_property(_cv.CvMSERParams_minArea_get, _cv.CvMSERParams_minArea_set)
+    __swig_setmethods__["maxVariation"] = _cv.CvMSERParams_maxVariation_set
+    __swig_getmethods__["maxVariation"] = _cv.CvMSERParams_maxVariation_get
+    if _newclass:maxVariation = _swig_property(_cv.CvMSERParams_maxVariation_get, _cv.CvMSERParams_maxVariation_set)
+    __swig_setmethods__["minDiversity"] = _cv.CvMSERParams_minDiversity_set
+    __swig_getmethods__["minDiversity"] = _cv.CvMSERParams_minDiversity_get
+    if _newclass:minDiversity = _swig_property(_cv.CvMSERParams_minDiversity_get, _cv.CvMSERParams_minDiversity_set)
+    __swig_setmethods__["maxEvolution"] = _cv.CvMSERParams_maxEvolution_set
+    __swig_getmethods__["maxEvolution"] = _cv.CvMSERParams_maxEvolution_get
+    if _newclass:maxEvolution = _swig_property(_cv.CvMSERParams_maxEvolution_get, _cv.CvMSERParams_maxEvolution_set)
+    __swig_setmethods__["areaThreshold"] = _cv.CvMSERParams_areaThreshold_set
+    __swig_getmethods__["areaThreshold"] = _cv.CvMSERParams_areaThreshold_get
+    if _newclass:areaThreshold = _swig_property(_cv.CvMSERParams_areaThreshold_get, _cv.CvMSERParams_areaThreshold_set)
+    __swig_setmethods__["minMargin"] = _cv.CvMSERParams_minMargin_set
+    __swig_getmethods__["minMargin"] = _cv.CvMSERParams_minMargin_get
+    if _newclass:minMargin = _swig_property(_cv.CvMSERParams_minMargin_get, _cv.CvMSERParams_minMargin_set)
+    __swig_setmethods__["edgeBlurSize"] = _cv.CvMSERParams_edgeBlurSize_set
+    __swig_getmethods__["edgeBlurSize"] = _cv.CvMSERParams_edgeBlurSize_get
+    if _newclass:edgeBlurSize = _swig_property(_cv.CvMSERParams_edgeBlurSize_get, _cv.CvMSERParams_edgeBlurSize_set)
+    def __init__(self): 
+        """__init__(self) -> CvMSERParams"""
+        this = _cv.new_CvMSERParams()
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _cv.delete_CvMSERParams
+    __del__ = lambda self : None;
+CvMSERParams_swigregister = _cv.CvMSERParams_swigregister
+CvMSERParams_swigregister(CvMSERParams)
+
+
+def cvMSERParams(*args):
+  """
+    cvMSERParams(int delta = 5, int min_area = 60, int max_area = 14400, 
+        float max_variation = .25, float min_diversity = .2, 
+        int max_evolution = 200, double area_threshold = 1.01, 
+        double min_margin = .003, 
+        int edge_blur_size = 5) -> CvMSERParams
+    """
+  return _cv.cvMSERParams(*args)
+
+def cvExtractMSER(*args):
+  """
+    cvExtractMSER(CvArr _img, CvArr _mask, CvSeq contours, CvMemStorage storage, 
+        CvMSERParams params)
+    """
+  return _cv.cvExtractMSER(*args)
+class CvStarKeypoint(_object):
+    """Proxy of C++ CvStarKeypoint class"""
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, CvStarKeypoint, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, CvStarKeypoint, name)
+    __repr__ = _swig_repr
+    __swig_setmethods__["pt"] = _cv.CvStarKeypoint_pt_set
+    __swig_getmethods__["pt"] = _cv.CvStarKeypoint_pt_get
+    if _newclass:pt = _swig_property(_cv.CvStarKeypoint_pt_get, _cv.CvStarKeypoint_pt_set)
+    __swig_setmethods__["size"] = _cv.CvStarKeypoint_size_set
+    __swig_getmethods__["size"] = _cv.CvStarKeypoint_size_get
+    if _newclass:size = _swig_property(_cv.CvStarKeypoint_size_get, _cv.CvStarKeypoint_size_set)
+    __swig_setmethods__["response"] = _cv.CvStarKeypoint_response_set
+    __swig_getmethods__["response"] = _cv.CvStarKeypoint_response_get
+    if _newclass:response = _swig_property(_cv.CvStarKeypoint_response_get, _cv.CvStarKeypoint_response_set)
+    def __init__(self): 
+        """__init__(self) -> CvStarKeypoint"""
+        this = _cv.new_CvStarKeypoint()
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _cv.delete_CvStarKeypoint
+    __del__ = lambda self : None;
+CvStarKeypoint_swigregister = _cv.CvStarKeypoint_swigregister
+CvStarKeypoint_swigregister(CvStarKeypoint)
+
+
+def cvStarKeypoint(*args):
+  """cvStarKeypoint(CvPoint pt, int size, float response) -> CvStarKeypoint"""
+  return _cv.cvStarKeypoint(*args)
+class CvStarDetectorParams(_object):
+    """Proxy of C++ CvStarDetectorParams class"""
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, CvStarDetectorParams, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, CvStarDetectorParams, name)
+    __repr__ = _swig_repr
+    __swig_setmethods__["maxSize"] = _cv.CvStarDetectorParams_maxSize_set
+    __swig_getmethods__["maxSize"] = _cv.CvStarDetectorParams_maxSize_get
+    if _newclass:maxSize = _swig_property(_cv.CvStarDetectorParams_maxSize_get, _cv.CvStarDetectorParams_maxSize_set)
+    __swig_setmethods__["responseThreshold"] = _cv.CvStarDetectorParams_responseThreshold_set
+    __swig_getmethods__["responseThreshold"] = _cv.CvStarDetectorParams_responseThreshold_get
+    if _newclass:responseThreshold = _swig_property(_cv.CvStarDetectorParams_responseThreshold_get, _cv.CvStarDetectorParams_responseThreshold_set)
+    __swig_setmethods__["lineThresholdProjected"] = _cv.CvStarDetectorParams_lineThresholdProjected_set
+    __swig_getmethods__["lineThresholdProjected"] = _cv.CvStarDetectorParams_lineThresholdProjected_get
+    if _newclass:lineThresholdProjected = _swig_property(_cv.CvStarDetectorParams_lineThresholdProjected_get, _cv.CvStarDetectorParams_lineThresholdProjected_set)
+    __swig_setmethods__["lineThresholdBinarized"] = _cv.CvStarDetectorParams_lineThresholdBinarized_set
+    __swig_getmethods__["lineThresholdBinarized"] = _cv.CvStarDetectorParams_lineThresholdBinarized_get
+    if _newclass:lineThresholdBinarized = _swig_property(_cv.CvStarDetectorParams_lineThresholdBinarized_get, _cv.CvStarDetectorParams_lineThresholdBinarized_set)
+    __swig_setmethods__["suppressNonmaxSize"] = _cv.CvStarDetectorParams_suppressNonmaxSize_set
+    __swig_getmethods__["suppressNonmaxSize"] = _cv.CvStarDetectorParams_suppressNonmaxSize_get
+    if _newclass:suppressNonmaxSize = _swig_property(_cv.CvStarDetectorParams_suppressNonmaxSize_get, _cv.CvStarDetectorParams_suppressNonmaxSize_set)
+    def __init__(self): 
+        """__init__(self) -> CvStarDetectorParams"""
+        this = _cv.new_CvStarDetectorParams()
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _cv.delete_CvStarDetectorParams
+    __del__ = lambda self : None;
+CvStarDetectorParams_swigregister = _cv.CvStarDetectorParams_swigregister
+CvStarDetectorParams_swigregister(CvStarDetectorParams)
+
+
+def cvStarDetectorParams(maxSize = 45, responseThreshold = 30, lineThresholdProjected = 10, 
+    lineThresholdBinarized = 8, suppressNonmaxSize = 5):
+  """
+    cvStarDetectorParams(int maxSize = 45, int responseThreshold = 30, int lineThresholdProjected = 10, 
+        int lineThresholdBinarized = 8, 
+        int suppressNonmaxSize = 5) -> CvStarDetectorParams
+    """
+  return _cv.cvStarDetectorParams(maxSize, responseThreshold, lineThresholdProjected, 
+    lineThresholdBinarized, suppressNonmaxSize)
+
+def cvGetStarKeypoints(*args):
+  """cvGetStarKeypoints(CvArr img, CvMemStorage storage, CvStarDetectorParams params = cvStarDetectorParams()) -> CvSeq"""
+  return _cv.cvGetStarKeypoints(*args)
+
 def cvLoadHaarClassifierCascade(*args):
   """cvLoadHaarClassifierCascade(char directory, CvSize orig_window_size) -> CvHaarClassifierCascade"""
   return _cv.cvLoadHaarClassifierCascade(*args)
@@ -7293,91 +7653,161 @@ def cvSetImagesForHaarClassifierCascade(*args):
   return _cv.cvSetImagesForHaarClassifierCascade(*args)
 
 def cvRunHaarClassifierCascade(*args):
-  """cvRunHaarClassifierCascade(CvHaarClassifierCascade cascade, CvPoint pt, int start_stage=0) -> int"""
+  """cvRunHaarClassifierCascade(CvHaarClassifierCascade cascade, CvPoint pt, int start_stage = 0) -> int"""
   return _cv.cvRunHaarClassifierCascade(*args)
 
 def cvUndistort2(*args):
-  """cvUndistort2(CvArr src, CvArr dst, CvMat intrinsic_matrix, CvMat distortion_coeffs)"""
+  """cvUndistort2(CvArr src, CvArr dst, CvMat camera_matrix, CvMat distortion_coeffs)"""
   return _cv.cvUndistort2(*args)
 
 def cvInitUndistortMap(*args):
   """
-    cvInitUndistortMap(CvMat intrinsic_matrix, CvMat distortion_coeffs, CvArr mapx, 
+    cvInitUndistortMap(CvMat camera_matrix, CvMat distortion_coeffs, CvArr mapx, 
         CvArr mapy)
     """
   return _cv.cvInitUndistortMap(*args)
 
+def cvInitUndistortRectifyMap(*args):
+  """
+    cvInitUndistortRectifyMap(CvMat camera_matrix, CvMat dist_coeffs, CvMat R, CvMat new_camera_matrix, 
+        CvArr mapx, CvArr mapy)
+    """
+  return _cv.cvInitUndistortRectifyMap(*args)
+
+def cvUndistortPoints(*args):
+  """
+    cvUndistortPoints(CvMat src, CvMat dst, CvMat camera_matrix, CvMat dist_coeffs, 
+        CvMat R = None, CvMat P = None)
+    """
+  return _cv.cvUndistortPoints(*args)
+
 def cvRodrigues2(*args):
-  """cvRodrigues2(CvMat src, CvMat dst, CvMat jacobian=0) -> int"""
+  """cvRodrigues2(CvMat src, CvMat dst, CvMat jacobian = None) -> int"""
   return _cv.cvRodrigues2(*args)
 
 def cvFindHomography(*args):
-  """cvFindHomography(CvMat src_points, CvMat dst_points, CvMat homography)"""
+  """
+    cvFindHomography(CvMat src_points, CvMat dst_points, int method = 0, 
+        double ransacReprojThreshold = 0, CvMat mask = None) -> int
+    """
   return _cv.cvFindHomography(*args)
 
 def cvRQDecomp3x3(*args):
   """
-    cvRQDecomp3x3(CvMat matrixM, CvMat matrixR, CvMat matrixQ, CvMat matrixQx=None, 
-        CvMat matrixQy=None, CvMat matrixQz=None, 
-        CvPoint3D64f eulerAngles=None)
+    cvRQDecomp3x3(CvMat matrixM, CvMat matrixR, CvMat matrixQ, CvMat matrixQx = None, 
+        CvMat matrixQy = None, CvMat matrixQz = None, 
+        CvPoint3D64f eulerAngles = None)
     """
   return _cv.cvRQDecomp3x3(*args)
 
 def cvDecomposeProjectionMatrix(*args):
   """
     cvDecomposeProjectionMatrix(CvMat projMatr, CvMat calibMatr, CvMat rotMatr, CvMat posVect, 
-        CvMat rotMatrX=None, CvMat rotMatrY=None, 
-        CvMat rotMatrZ=None, CvPoint3D64f eulerAngles=None)
+        CvMat rotMatrX = None, CvMat rotMatrY = None, 
+        CvMat rotMatrZ = None, CvPoint3D64f eulerAngles = None)
     """
   return _cv.cvDecomposeProjectionMatrix(*args)
 
+def cvCalcMatMulDeriv(*args):
+  """cvCalcMatMulDeriv(CvMat A, CvMat B, CvMat dABdA, CvMat dABdB)"""
+  return _cv.cvCalcMatMulDeriv(*args)
+
+def cvComposeRT(*args):
+  """
+    cvComposeRT(CvMat _rvec1, CvMat _tvec1, CvMat _rvec2, CvMat _tvec2, 
+        CvMat _rvec3, CvMat _tvec3, CvMat dr3dr1 = None, 
+        CvMat dr3dt1 = None, CvMat dr3dr2 = None, 
+        CvMat dr3dt2 = None, CvMat dt3dr1 = None, 
+        CvMat dt3dt1 = None, CvMat dt3dr2 = None, 
+        CvMat dt3dt2 = None)
+    """
+  return _cv.cvComposeRT(*args)
+
 def cvProjectPoints2(*args):
   """
     cvProjectPoints2(CvMat object_points, CvMat rotation_vector, CvMat translation_vector, 
-        CvMat intrinsic_matrix, CvMat distortion_coeffs, 
-        CvMat image_points, CvMat dpdrot=None, 
-        CvMat dpdt=None, CvMat dpdf=None, 
-        CvMat dpdc=None, CvMat dpddist=None)
+        CvMat camera_matrix, CvMat distortion_coeffs, 
+        CvMat image_points, CvMat dpdrot = None, 
+        CvMat dpdt = None, CvMat dpdf = None, 
+        CvMat dpdc = None, CvMat dpddist = None, 
+        double aspect_ratio = 0)
     """
   return _cv.cvProjectPoints2(*args)
 
 def cvFindExtrinsicCameraParams2(*args):
   """
-    cvFindExtrinsicCameraParams2(CvMat object_points, CvMat image_points, CvMat intrinsic_matrix, 
+    cvFindExtrinsicCameraParams2(CvMat object_points, CvMat image_points, CvMat camera_matrix, 
         CvMat distortion_coeffs, CvMat rotation_vector, 
-        CvMat translation_vector)
+        CvMat translation_vector, int use_extrinsic_guess = 0)
     """
   return _cv.cvFindExtrinsicCameraParams2(*args)
 
+def cvInitIntrinsicParams2D(*args):
+  """
+    cvInitIntrinsicParams2D(CvMat object_points, CvMat image_points, CvMat npoints, 
+        CvSize image_size, CvMat camera_matrix, 
+        double aspect_ratio = 1.)
+    """
+  return _cv.cvInitIntrinsicParams2D(*args)
+
+def cvFindChessboardCorners(*args):
+  """cvFindChessboardCorners(void image, CvSize pattern_size, int flags = 1+2) -> int"""
+  return _cv.cvFindChessboardCorners(*args)
+
+def cvDrawChessboardCorners(*args):
+  """
+    cvDrawChessboardCorners(CvArr image, CvSize pattern_size, CvPoint2D32f corners, 
+        int pattern_was_found)
+    """
+  return _cv.cvDrawChessboardCorners(*args)
+
 def cvCalibrateCamera2(*args):
   """
     cvCalibrateCamera2(CvMat object_points, CvMat image_points, CvMat point_counts, 
-        CvSize image_size, CvMat intrinsic_matrix, 
-        CvMat rotation_vectors=None, CvMat translation_vectors=None, 
-        int flags=0)
+        CvSize image_size, CvMat camera_matrix, 
+        CvMat distortion_coeffs, CvMat rotation_vectors = None, 
+        CvMat translation_vectors = None, 
+        int flags = 0)
     """
   return _cv.cvCalibrateCamera2(*args)
 
 def cvCalibrationMatrixValues(*args):
   """
-    cvCalibrationMatrixValues(CvMat calibMatr, int imgWidth, int imgHeight, double apertureWidth=0, 
-        double apertureHeight=0, double fovx=None, 
-        double fovy=None, double focalLength=None, 
-        CvPoint2D64f principalPoint=None, 
-        double pixelAspectRatio=None)
+    cvCalibrationMatrixValues(CvMat camera_matrix, CvSize image_size, double aperture_width = 0, 
+        double aperture_height = 0, double fovx = None, 
+        double fovy = None, double focal_length = None, 
+        CvPoint2D64f principal_point = None, 
+        double pixel_aspect_ratio = None)
     """
   return _cv.cvCalibrationMatrixValues(*args)
 
-def cvFindChessboardCorners(*args):
-  """cvFindChessboardCorners(void image, CvSize pattern_size, int flags=1) -> int"""
-  return _cv.cvFindChessboardCorners(*args)
+def cvStereoCalibrate(*args):
+  """
+    cvStereoCalibrate(CvMat object_points, CvMat image_points1, CvMat image_points2, 
+        CvMat npoints, CvMat camera_matrix1, 
+        CvMat dist_coeffs1, CvMat camera_matrix2, 
+        CvMat dist_coeffs2, CvSize image_size, CvMat R, 
+        CvMat T, CvMat E = None, CvMat F = None, 
+        CvTermCriteria term_crit = cvTermCriteria( 1 +2,30,1e-6), 
+        int flags = 256)
+    """
+  return _cv.cvStereoCalibrate(*args)
 
-def cvDrawChessboardCorners(*args):
+def cvStereoRectify(*args):
   """
-    cvDrawChessboardCorners(CvArr image, CvSize pattern_size, CvPoint2D32f corners, 
-        int pattern_was_found)
+    cvStereoRectify(CvMat camera_matrix1, CvMat camera_matrix2, CvMat dist_coeffs1, 
+        CvMat dist_coeffs2, CvSize image_size, 
+        CvMat R, CvMat T, CvMat R1, CvMat R2, 
+        CvMat P1, CvMat P2, CvMat Q = None, int flags = 1024)
     """
-  return _cv.cvDrawChessboardCorners(*args)
+  return _cv.cvStereoRectify(*args)
+
+def cvStereoRectifyUncalibrated(*args):
+  """
+    cvStereoRectifyUncalibrated(CvMat points1, CvMat points2, CvMat F, CvSize img_size, 
+        CvMat H1, CvMat H2, double threshold = 5) -> int
+    """
+  return _cv.cvStereoRectifyUncalibrated(*args)
 
 def cvCreatePOSITObject(*args):
   """cvCreatePOSITObject(CvPoint3D32f points, int point_count) -> CvPOSITObject"""
@@ -7391,19 +7821,23 @@ def cvPOSIT(*args):
     """
   return _cv.cvPOSIT(*args)
 
+def cvReleasePOSITObject(*args):
+  """cvReleasePOSITObject(CvPOSITObject posit_object)"""
+  return _cv.cvReleasePOSITObject(*args)
+
 def cvRANSACUpdateNumIters(*args):
   """cvRANSACUpdateNumIters(double p, double err_prob, int model_points, int max_iters) -> int"""
   return _cv.cvRANSACUpdateNumIters(*args)
 
-def cvConvertPointsHomogenious(*args):
-  """cvConvertPointsHomogenious(CvMat src, CvMat dst)"""
-  return _cv.cvConvertPointsHomogenious(*args)
+def cvConvertPointsHomogeneous(*args):
+  """cvConvertPointsHomogeneous(CvMat src, CvMat dst)"""
+  return _cv.cvConvertPointsHomogeneous(*args)
 
 def cvFindFundamentalMat(*args):
   """
     cvFindFundamentalMat(CvMat points1, CvMat points2, CvMat fundamental_matrix, 
-        int method=(8+2), double param1=1., double param2=0.99, 
-        CvMat status=None) -> int
+        int method = 8, double param1 = 3., double param2 = 0.99, 
+        CvMat status = None) -> int
     """
   return _cv.cvFindFundamentalMat(*args)
 
@@ -7413,559 +7847,202 @@ def cvComputeCorrespondEpilines(*args):
         CvMat correspondent_lines)
     """
   return _cv.cvComputeCorrespondEpilines(*args)
-class CvBaseImageFilter(_object):
-    """Proxy of C++ CvBaseImageFilter class"""
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CvBaseImageFilter, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CvBaseImageFilter, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        """
-        __init__(self) -> CvBaseImageFilter
-        __init__(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1, CvScalar _border_value=cvScalarAll(0)) -> CvBaseImageFilter
-        __init__(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1) -> CvBaseImageFilter
-        __init__(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1)) -> CvBaseImageFilter
-        __init__(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize) -> CvBaseImageFilter
-        """
-        this = _cv.new_CvBaseImageFilter(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _cv.delete_CvBaseImageFilter
-    __del__ = lambda self : None;
-    def init(*args):
-        """
-        init(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1, CvScalar _border_value=cvScalarAll(0))
-        init(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1)
-        init(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1))
-        init(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize)
-        """
-        return _cv.CvBaseImageFilter_init(*args)
-
-    def clear(*args):
-        """clear(self)"""
-        return _cv.CvBaseImageFilter_clear(*args)
-
-    def process(*args):
-        """
-        process(self, CvMat _src, CvMat _dst, CvRect _src_roi=cvRect(0,0,-1,-1), 
-            CvPoint _dst_origin=cvPoint(0,0), int _flags=0) -> int
-        process(self, CvMat _src, CvMat _dst, CvRect _src_roi=cvRect(0,0,-1,-1), 
-            CvPoint _dst_origin=cvPoint(0,0)) -> int
-        process(self, CvMat _src, CvMat _dst, CvRect _src_roi=cvRect(0,0,-1,-1)) -> int
-        process(self, CvMat _src, CvMat _dst) -> int
-        """
-        return _cv.CvBaseImageFilter_process(*args)
-
-    def get_src_type(*args):
-        """get_src_type(self) -> int"""
-        return _cv.CvBaseImageFilter_get_src_type(*args)
-
-    def get_dst_type(*args):
-        """get_dst_type(self) -> int"""
-        return _cv.CvBaseImageFilter_get_dst_type(*args)
-
-    def get_work_type(*args):
-        """get_work_type(self) -> int"""
-        return _cv.CvBaseImageFilter_get_work_type(*args)
-
-    def get_kernel_size(*args):
-        """get_kernel_size(self) -> CvSize"""
-        return _cv.CvBaseImageFilter_get_kernel_size(*args)
-
-    def get_anchor(*args):
-        """get_anchor(self) -> CvPoint"""
-        return _cv.CvBaseImageFilter_get_anchor(*args)
-
-    def get_width(*args):
-        """get_width(self) -> int"""
-        return _cv.CvBaseImageFilter_get_width(*args)
-
-    def get_x_filter_func(*args):
-        """get_x_filter_func(self) -> CvRowFilterFunc"""
-        return _cv.CvBaseImageFilter_get_x_filter_func(*args)
-
-    def get_y_filter_func(*args):
-        """get_y_filter_func(self) -> CvColumnFilterFunc"""
-        return _cv.CvBaseImageFilter_get_y_filter_func(*args)
-
-CvBaseImageFilter_swigregister = _cv.CvBaseImageFilter_swigregister
-CvBaseImageFilter_swigregister(CvBaseImageFilter)
-
-class CvSepFilter(CvBaseImageFilter):
-    """Proxy of C++ CvSepFilter class"""
-    __swig_setmethods__ = {}
-    for _s in [CvBaseImageFilter]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CvSepFilter, name, value)
-    __swig_getmethods__ = {}
-    for _s in [CvBaseImageFilter]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, CvSepFilter, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        """
-        __init__(self) -> CvSepFilter
-        __init__(self, int _max_width, int _src_type, int _dst_type, CvMat _kx, 
-            CvMat _ky, CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1, CvScalar _border_value=cvScalarAll(0)) -> CvSepFilter
-        __init__(self, int _max_width, int _src_type, int _dst_type, CvMat _kx, 
-            CvMat _ky, CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1) -> CvSepFilter
-        __init__(self, int _max_width, int _src_type, int _dst_type, CvMat _kx, 
-            CvMat _ky, CvPoint _anchor=cvPoint(-1,-1)) -> CvSepFilter
-        __init__(self, int _max_width, int _src_type, int _dst_type, CvMat _kx, 
-            CvMat _ky) -> CvSepFilter
-        """
-        this = _cv.new_CvSepFilter(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _cv.delete_CvSepFilter
-    __del__ = lambda self : None;
-    def init_deriv(*args):
-        """
-        init_deriv(self, int _max_width, int _src_type, int _dst_type, int dx, 
-            int dy, int aperture_size, int flags=0)
-        init_deriv(self, int _max_width, int _src_type, int _dst_type, int dx, 
-            int dy, int aperture_size)
-        """
-        return _cv.CvSepFilter_init_deriv(*args)
-
-    def init_gaussian(*args):
-        """
-        init_gaussian(self, int _max_width, int _src_type, int _dst_type, int gaussian_size, 
-            double sigma)
-        """
-        return _cv.CvSepFilter_init_gaussian(*args)
-
-    def init(*args):
-        """
-        init(self, int _max_width, int _src_type, int _dst_type, CvMat _kx, 
-            CvMat _ky, CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1, CvScalar _border_value=cvScalarAll(0))
-        init(self, int _max_width, int _src_type, int _dst_type, CvMat _kx, 
-            CvMat _ky, CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1)
-        init(self, int _max_width, int _src_type, int _dst_type, CvMat _kx, 
-            CvMat _ky, CvPoint _anchor=cvPoint(-1,-1))
-        init(self, int _max_width, int _src_type, int _dst_type, CvMat _kx, 
-            CvMat _ky)
-        init(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1, CvScalar _border_value=cvScalarAll(0))
-        init(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1)
-        init(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1))
-        init(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize)
-        """
-        return _cv.CvSepFilter_init(*args)
-
-    def clear(*args):
-        """clear(self)"""
-        return _cv.CvSepFilter_clear(*args)
 
-    def get_x_kernel(*args):
-        """get_x_kernel(self) -> CvMat"""
-        return _cv.CvSepFilter_get_x_kernel(*args)
-
-    def get_y_kernel(*args):
-        """get_y_kernel(self) -> CvMat"""
-        return _cv.CvSepFilter_get_y_kernel(*args)
-
-    def get_x_kernel_flags(*args):
-        """get_x_kernel_flags(self) -> int"""
-        return _cv.CvSepFilter_get_x_kernel_flags(*args)
-
-    def get_y_kernel_flags(*args):
-        """get_y_kernel_flags(self) -> int"""
-        return _cv.CvSepFilter_get_y_kernel_flags(*args)
-
-    GENERIC = _cv.CvSepFilter_GENERIC
-    ASYMMETRICAL = _cv.CvSepFilter_ASYMMETRICAL
-    SYMMETRICAL = _cv.CvSepFilter_SYMMETRICAL
-    POSITIVE = _cv.CvSepFilter_POSITIVE
-    SUM_TO_1 = _cv.CvSepFilter_SUM_TO_1
-    INTEGER = _cv.CvSepFilter_INTEGER
-    NORMALIZE_KERNEL = _cv.CvSepFilter_NORMALIZE_KERNEL
-    FLIP_KERNEL = _cv.CvSepFilter_FLIP_KERNEL
-    def init_gaussian_kernel(*args):
-        """
-        init_gaussian_kernel(CvMat kernel, double sigma=-1)
-        init_gaussian_kernel(CvMat kernel)
-        """
-        return _cv.CvSepFilter_init_gaussian_kernel(*args)
-
-    if _newclass:init_gaussian_kernel = staticmethod(init_gaussian_kernel)
-    __swig_getmethods__["init_gaussian_kernel"] = lambda x: init_gaussian_kernel
-    def init_sobel_kernel(*args):
-        """
-        init_sobel_kernel(CvMat _kx, CvMat _ky, int dx, int dy, int flags=0)
-        init_sobel_kernel(CvMat _kx, CvMat _ky, int dx, int dy)
-        """
-        return _cv.CvSepFilter_init_sobel_kernel(*args)
-
-    if _newclass:init_sobel_kernel = staticmethod(init_sobel_kernel)
-    __swig_getmethods__["init_sobel_kernel"] = lambda x: init_sobel_kernel
-    def init_scharr_kernel(*args):
-        """
-        init_scharr_kernel(CvMat _kx, CvMat _ky, int dx, int dy, int flags=0)
-        init_scharr_kernel(CvMat _kx, CvMat _ky, int dx, int dy)
-        """
-        return _cv.CvSepFilter_init_scharr_kernel(*args)
-
-    if _newclass:init_scharr_kernel = staticmethod(init_scharr_kernel)
-    __swig_getmethods__["init_scharr_kernel"] = lambda x: init_scharr_kernel
-CvSepFilter_swigregister = _cv.CvSepFilter_swigregister
-CvSepFilter_swigregister(CvSepFilter)
-
-def CvSepFilter_init_gaussian_kernel(*args):
-  """
-    init_gaussian_kernel(CvMat kernel, double sigma=-1)
-    CvSepFilter_init_gaussian_kernel(CvMat kernel)
-    """
-  return _cv.CvSepFilter_init_gaussian_kernel(*args)
-
-def CvSepFilter_init_sobel_kernel(*args):
+def cvTriangulatePoints(*args):
   """
-    init_sobel_kernel(CvMat _kx, CvMat _ky, int dx, int dy, int flags=0)
-    CvSepFilter_init_sobel_kernel(CvMat _kx, CvMat _ky, int dx, int dy)
+    cvTriangulatePoints(CvMat projMatr1, CvMat projMatr2, CvMat projPoints1, 
+        CvMat projPoints2, CvMat points4D)
     """
-  return _cv.CvSepFilter_init_sobel_kernel(*args)
+  return _cv.cvTriangulatePoints(*args)
 
-def CvSepFilter_init_scharr_kernel(*args):
+def cvCorrectMatches(*args):
   """
-    init_scharr_kernel(CvMat _kx, CvMat _ky, int dx, int dy, int flags=0)
-    CvSepFilter_init_scharr_kernel(CvMat _kx, CvMat _ky, int dx, int dy)
+    cvCorrectMatches(CvMat F, CvMat points1, CvMat points2, CvMat new_points1, 
+        CvMat new_points2)
     """
-  return _cv.CvSepFilter_init_scharr_kernel(*args)
-
-class CvLinearFilter(CvBaseImageFilter):
-    """Proxy of C++ CvLinearFilter class"""
+  return _cv.cvCorrectMatches(*args)
+class CvStereoBMState(_object):
+    """Proxy of C++ CvStereoBMState class"""
     __swig_setmethods__ = {}
-    for _s in [CvBaseImageFilter]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CvLinearFilter, name, value)
+    __setattr__ = lambda self, name, value: _swig_setattr(self, CvStereoBMState, name, value)
     __swig_getmethods__ = {}
-    for _s in [CvBaseImageFilter]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, CvLinearFilter, name)
+    __getattr__ = lambda self, name: _swig_getattr(self, CvStereoBMState, name)
     __repr__ = _swig_repr
-    def __init__(self, *args): 
-        """
-        __init__(self) -> CvLinearFilter
-        __init__(self, int _max_width, int _src_type, int _dst_type, CvMat _kernel, 
-            CvPoint _anchor=cvPoint(-1,-1), int _border_mode=1, 
-            CvScalar _border_value=cvScalarAll(0)) -> CvLinearFilter
-        __init__(self, int _max_width, int _src_type, int _dst_type, CvMat _kernel, 
-            CvPoint _anchor=cvPoint(-1,-1), int _border_mode=1) -> CvLinearFilter
-        __init__(self, int _max_width, int _src_type, int _dst_type, CvMat _kernel, 
-            CvPoint _anchor=cvPoint(-1,-1)) -> CvLinearFilter
-        __init__(self, int _max_width, int _src_type, int _dst_type, CvMat _kernel) -> CvLinearFilter
-        """
-        this = _cv.new_CvLinearFilter(*args)
+    __swig_setmethods__["preFilterType"] = _cv.CvStereoBMState_preFilterType_set
+    __swig_getmethods__["preFilterType"] = _cv.CvStereoBMState_preFilterType_get
+    if _newclass:preFilterType = _swig_property(_cv.CvStereoBMState_preFilterType_get, _cv.CvStereoBMState_preFilterType_set)
+    __swig_setmethods__["preFilterSize"] = _cv.CvStereoBMState_preFilterSize_set
+    __swig_getmethods__["preFilterSize"] = _cv.CvStereoBMState_preFilterSize_get
+    if _newclass:preFilterSize = _swig_property(_cv.CvStereoBMState_preFilterSize_get, _cv.CvStereoBMState_preFilterSize_set)
+    __swig_setmethods__["preFilterCap"] = _cv.CvStereoBMState_preFilterCap_set
+    __swig_getmethods__["preFilterCap"] = _cv.CvStereoBMState_preFilterCap_get
+    if _newclass:preFilterCap = _swig_property(_cv.CvStereoBMState_preFilterCap_get, _cv.CvStereoBMState_preFilterCap_set)
+    __swig_setmethods__["SADWindowSize"] = _cv.CvStereoBMState_SADWindowSize_set
+    __swig_getmethods__["SADWindowSize"] = _cv.CvStereoBMState_SADWindowSize_get
+    if _newclass:SADWindowSize = _swig_property(_cv.CvStereoBMState_SADWindowSize_get, _cv.CvStereoBMState_SADWindowSize_set)
+    __swig_setmethods__["minDisparity"] = _cv.CvStereoBMState_minDisparity_set
+    __swig_getmethods__["minDisparity"] = _cv.CvStereoBMState_minDisparity_get
+    if _newclass:minDisparity = _swig_property(_cv.CvStereoBMState_minDisparity_get, _cv.CvStereoBMState_minDisparity_set)
+    __swig_setmethods__["numberOfDisparities"] = _cv.CvStereoBMState_numberOfDisparities_set
+    __swig_getmethods__["numberOfDisparities"] = _cv.CvStereoBMState_numberOfDisparities_get
+    if _newclass:numberOfDisparities = _swig_property(_cv.CvStereoBMState_numberOfDisparities_get, _cv.CvStereoBMState_numberOfDisparities_set)
+    __swig_setmethods__["textureThreshold"] = _cv.CvStereoBMState_textureThreshold_set
+    __swig_getmethods__["textureThreshold"] = _cv.CvStereoBMState_textureThreshold_get
+    if _newclass:textureThreshold = _swig_property(_cv.CvStereoBMState_textureThreshold_get, _cv.CvStereoBMState_textureThreshold_set)
+    __swig_setmethods__["uniquenessRatio"] = _cv.CvStereoBMState_uniquenessRatio_set
+    __swig_getmethods__["uniquenessRatio"] = _cv.CvStereoBMState_uniquenessRatio_get
+    if _newclass:uniquenessRatio = _swig_property(_cv.CvStereoBMState_uniquenessRatio_get, _cv.CvStereoBMState_uniquenessRatio_set)
+    __swig_setmethods__["speckleWindowSize"] = _cv.CvStereoBMState_speckleWindowSize_set
+    __swig_getmethods__["speckleWindowSize"] = _cv.CvStereoBMState_speckleWindowSize_get
+    if _newclass:speckleWindowSize = _swig_property(_cv.CvStereoBMState_speckleWindowSize_get, _cv.CvStereoBMState_speckleWindowSize_set)
+    __swig_setmethods__["speckleRange"] = _cv.CvStereoBMState_speckleRange_set
+    __swig_getmethods__["speckleRange"] = _cv.CvStereoBMState_speckleRange_get
+    if _newclass:speckleRange = _swig_property(_cv.CvStereoBMState_speckleRange_get, _cv.CvStereoBMState_speckleRange_set)
+    __swig_setmethods__["trySmallerWindows"] = _cv.CvStereoBMState_trySmallerWindows_set
+    __swig_getmethods__["trySmallerWindows"] = _cv.CvStereoBMState_trySmallerWindows_get
+    if _newclass:trySmallerWindows = _swig_property(_cv.CvStereoBMState_trySmallerWindows_get, _cv.CvStereoBMState_trySmallerWindows_set)
+    __swig_setmethods__["preFilteredImg0"] = _cv.CvStereoBMState_preFilteredImg0_set
+    __swig_getmethods__["preFilteredImg0"] = _cv.CvStereoBMState_preFilteredImg0_get
+    if _newclass:preFilteredImg0 = _swig_property(_cv.CvStereoBMState_preFilteredImg0_get, _cv.CvStereoBMState_preFilteredImg0_set)
+    __swig_setmethods__["preFilteredImg1"] = _cv.CvStereoBMState_preFilteredImg1_set
+    __swig_getmethods__["preFilteredImg1"] = _cv.CvStereoBMState_preFilteredImg1_get
+    if _newclass:preFilteredImg1 = _swig_property(_cv.CvStereoBMState_preFilteredImg1_get, _cv.CvStereoBMState_preFilteredImg1_set)
+    __swig_setmethods__["slidingSumBuf"] = _cv.CvStereoBMState_slidingSumBuf_set
+    __swig_getmethods__["slidingSumBuf"] = _cv.CvStereoBMState_slidingSumBuf_get
+    if _newclass:slidingSumBuf = _swig_property(_cv.CvStereoBMState_slidingSumBuf_get, _cv.CvStereoBMState_slidingSumBuf_set)
+    __swig_setmethods__["dbmin"] = _cv.CvStereoBMState_dbmin_set
+    __swig_getmethods__["dbmin"] = _cv.CvStereoBMState_dbmin_get
+    if _newclass:dbmin = _swig_property(_cv.CvStereoBMState_dbmin_get, _cv.CvStereoBMState_dbmin_set)
+    __swig_setmethods__["dbmax"] = _cv.CvStereoBMState_dbmax_set
+    __swig_getmethods__["dbmax"] = _cv.CvStereoBMState_dbmax_get
+    if _newclass:dbmax = _swig_property(_cv.CvStereoBMState_dbmax_get, _cv.CvStereoBMState_dbmax_set)
+    def __init__(self): 
+        """__init__(self) -> CvStereoBMState"""
+        this = _cv.new_CvStereoBMState()
         try: self.this.append(this)
         except: self.this = this
-    __swig_destroy__ = _cv.delete_CvLinearFilter
+    __swig_destroy__ = _cv.delete_CvStereoBMState
     __del__ = lambda self : None;
-    def init(*args):
-        """
-        init(self, int _max_width, int _src_type, int _dst_type, CvMat _kernel, 
-            CvPoint _anchor=cvPoint(-1,-1), int _border_mode=1, 
-            CvScalar _border_value=cvScalarAll(0))
-        init(self, int _max_width, int _src_type, int _dst_type, CvMat _kernel, 
-            CvPoint _anchor=cvPoint(-1,-1), int _border_mode=1)
-        init(self, int _max_width, int _src_type, int _dst_type, CvMat _kernel, 
-            CvPoint _anchor=cvPoint(-1,-1))
-        init(self, int _max_width, int _src_type, int _dst_type, CvMat _kernel)
-        init(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1, CvScalar _border_value=cvScalarAll(0))
-        init(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1)
-        init(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1))
-        init(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize)
-        """
-        return _cv.CvLinearFilter_init(*args)
-
-    def clear(*args):
-        """clear(self)"""
-        return _cv.CvLinearFilter_clear(*args)
+CvStereoBMState_swigregister = _cv.CvStereoBMState_swigregister
+CvStereoBMState_swigregister(CvStereoBMState)
 
-    def get_kernel(*args):
-        """get_kernel(self) -> CvMat"""
-        return _cv.CvLinearFilter_get_kernel(*args)
 
-    def get_kernel_sparse_buf(*args):
-        """get_kernel_sparse_buf(self) -> uchar"""
-        return _cv.CvLinearFilter_get_kernel_sparse_buf(*args)
+def cvCreateStereoBMState(preset = 0, numberOfDisparities = 0):
+  """cvCreateStereoBMState(int preset = 0, int numberOfDisparities = 0) -> CvStereoBMState"""
+  return _cv.cvCreateStereoBMState(preset, numberOfDisparities)
 
-    def get_kernel_sparse_count(*args):
-        """get_kernel_sparse_count(self) -> int"""
-        return _cv.CvLinearFilter_get_kernel_sparse_count(*args)
+def cvReleaseStereoBMState(*args):
+  """cvReleaseStereoBMState(CvStereoBMState state)"""
+  return _cv.cvReleaseStereoBMState(*args)
 
-CvLinearFilter_swigregister = _cv.CvLinearFilter_swigregister
-CvLinearFilter_swigregister(CvLinearFilter)
-
-class CvBoxFilter(CvBaseImageFilter):
-    """Proxy of C++ CvBoxFilter class"""
+def cvFindStereoCorrespondenceBM(*args):
+  """cvFindStereoCorrespondenceBM(CvArr left, CvArr right, CvArr disparity, CvStereoBMState state)"""
+  return _cv.cvFindStereoCorrespondenceBM(*args)
+class CvStereoGCState(_object):
+    """Proxy of C++ CvStereoGCState class"""
     __swig_setmethods__ = {}
-    for _s in [CvBaseImageFilter]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CvBoxFilter, name, value)
+    __setattr__ = lambda self, name, value: _swig_setattr(self, CvStereoGCState, name, value)
     __swig_getmethods__ = {}
-    for _s in [CvBaseImageFilter]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, CvBoxFilter, name)
+    __getattr__ = lambda self, name: _swig_getattr(self, CvStereoGCState, name)
     __repr__ = _swig_repr
-    def __init__(self, *args): 
-        """
-        __init__(self) -> CvBoxFilter
-        __init__(self, int _max_width, int _src_type, int _dst_type, bool _normalized, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1, CvScalar _border_value=cvScalarAll(0)) -> CvBoxFilter
-        __init__(self, int _max_width, int _src_type, int _dst_type, bool _normalized, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1) -> CvBoxFilter
-        __init__(self, int _max_width, int _src_type, int _dst_type, bool _normalized, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1)) -> CvBoxFilter
-        __init__(self, int _max_width, int _src_type, int _dst_type, bool _normalized, 
-            CvSize _ksize) -> CvBoxFilter
-        """
-        this = _cv.new_CvBoxFilter(*args)
+    __swig_setmethods__["Ithreshold"] = _cv.CvStereoGCState_Ithreshold_set
+    __swig_getmethods__["Ithreshold"] = _cv.CvStereoGCState_Ithreshold_get
+    if _newclass:Ithreshold = _swig_property(_cv.CvStereoGCState_Ithreshold_get, _cv.CvStereoGCState_Ithreshold_set)
+    __swig_setmethods__["interactionRadius"] = _cv.CvStereoGCState_interactionRadius_set
+    __swig_getmethods__["interactionRadius"] = _cv.CvStereoGCState_interactionRadius_get
+    if _newclass:interactionRadius = _swig_property(_cv.CvStereoGCState_interactionRadius_get, _cv.CvStereoGCState_interactionRadius_set)
+    __swig_setmethods__["K"] = _cv.CvStereoGCState_K_set
+    __swig_getmethods__["K"] = _cv.CvStereoGCState_K_get
+    if _newclass:K = _swig_property(_cv.CvStereoGCState_K_get, _cv.CvStereoGCState_K_set)
+    __swig_setmethods__["_lambda"] = _cv.CvStereoGCState__lambda_set
+    __swig_getmethods__["_lambda"] = _cv.CvStereoGCState__lambda_get
+    if _newclass:_lambda = _swig_property(_cv.CvStereoGCState__lambda_get, _cv.CvStereoGCState__lambda_set)
+    __swig_setmethods__["lambda1"] = _cv.CvStereoGCState_lambda1_set
+    __swig_getmethods__["lambda1"] = _cv.CvStereoGCState_lambda1_get
+    if _newclass:lambda1 = _swig_property(_cv.CvStereoGCState_lambda1_get, _cv.CvStereoGCState_lambda1_set)
+    __swig_setmethods__["lambda2"] = _cv.CvStereoGCState_lambda2_set
+    __swig_getmethods__["lambda2"] = _cv.CvStereoGCState_lambda2_get
+    if _newclass:lambda2 = _swig_property(_cv.CvStereoGCState_lambda2_get, _cv.CvStereoGCState_lambda2_set)
+    __swig_setmethods__["occlusionCost"] = _cv.CvStereoGCState_occlusionCost_set
+    __swig_getmethods__["occlusionCost"] = _cv.CvStereoGCState_occlusionCost_get
+    if _newclass:occlusionCost = _swig_property(_cv.CvStereoGCState_occlusionCost_get, _cv.CvStereoGCState_occlusionCost_set)
+    __swig_setmethods__["minDisparity"] = _cv.CvStereoGCState_minDisparity_set
+    __swig_getmethods__["minDisparity"] = _cv.CvStereoGCState_minDisparity_get
+    if _newclass:minDisparity = _swig_property(_cv.CvStereoGCState_minDisparity_get, _cv.CvStereoGCState_minDisparity_set)
+    __swig_setmethods__["numberOfDisparities"] = _cv.CvStereoGCState_numberOfDisparities_set
+    __swig_getmethods__["numberOfDisparities"] = _cv.CvStereoGCState_numberOfDisparities_get
+    if _newclass:numberOfDisparities = _swig_property(_cv.CvStereoGCState_numberOfDisparities_get, _cv.CvStereoGCState_numberOfDisparities_set)
+    __swig_setmethods__["maxIters"] = _cv.CvStereoGCState_maxIters_set
+    __swig_getmethods__["maxIters"] = _cv.CvStereoGCState_maxIters_get
+    if _newclass:maxIters = _swig_property(_cv.CvStereoGCState_maxIters_get, _cv.CvStereoGCState_maxIters_set)
+    __swig_setmethods__["left"] = _cv.CvStereoGCState_left_set
+    __swig_getmethods__["left"] = _cv.CvStereoGCState_left_get
+    if _newclass:left = _swig_property(_cv.CvStereoGCState_left_get, _cv.CvStereoGCState_left_set)
+    __swig_setmethods__["right"] = _cv.CvStereoGCState_right_set
+    __swig_getmethods__["right"] = _cv.CvStereoGCState_right_get
+    if _newclass:right = _swig_property(_cv.CvStereoGCState_right_get, _cv.CvStereoGCState_right_set)
+    __swig_setmethods__["dispLeft"] = _cv.CvStereoGCState_dispLeft_set
+    __swig_getmethods__["dispLeft"] = _cv.CvStereoGCState_dispLeft_get
+    if _newclass:dispLeft = _swig_property(_cv.CvStereoGCState_dispLeft_get, _cv.CvStereoGCState_dispLeft_set)
+    __swig_setmethods__["dispRight"] = _cv.CvStereoGCState_dispRight_set
+    __swig_getmethods__["dispRight"] = _cv.CvStereoGCState_dispRight_get
+    if _newclass:dispRight = _swig_property(_cv.CvStereoGCState_dispRight_get, _cv.CvStereoGCState_dispRight_set)
+    __swig_setmethods__["ptrLeft"] = _cv.CvStereoGCState_ptrLeft_set
+    __swig_getmethods__["ptrLeft"] = _cv.CvStereoGCState_ptrLeft_get
+    if _newclass:ptrLeft = _swig_property(_cv.CvStereoGCState_ptrLeft_get, _cv.CvStereoGCState_ptrLeft_set)
+    __swig_setmethods__["ptrRight"] = _cv.CvStereoGCState_ptrRight_set
+    __swig_getmethods__["ptrRight"] = _cv.CvStereoGCState_ptrRight_get
+    if _newclass:ptrRight = _swig_property(_cv.CvStereoGCState_ptrRight_get, _cv.CvStereoGCState_ptrRight_set)
+    __swig_setmethods__["vtxBuf"] = _cv.CvStereoGCState_vtxBuf_set
+    __swig_getmethods__["vtxBuf"] = _cv.CvStereoGCState_vtxBuf_get
+    if _newclass:vtxBuf = _swig_property(_cv.CvStereoGCState_vtxBuf_get, _cv.CvStereoGCState_vtxBuf_set)
+    __swig_setmethods__["edgeBuf"] = _cv.CvStereoGCState_edgeBuf_set
+    __swig_getmethods__["edgeBuf"] = _cv.CvStereoGCState_edgeBuf_get
+    if _newclass:edgeBuf = _swig_property(_cv.CvStereoGCState_edgeBuf_get, _cv.CvStereoGCState_edgeBuf_set)
+    def __init__(self): 
+        """__init__(self) -> CvStereoGCState"""
+        this = _cv.new_CvStereoGCState()
         try: self.this.append(this)
         except: self.this = this
-    def init(*args):
-        """
-        init(self, int _max_width, int _src_type, int _dst_type, bool _normalized, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1, CvScalar _border_value=cvScalarAll(0))
-        init(self, int _max_width, int _src_type, int _dst_type, bool _normalized, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1)
-        init(self, int _max_width, int _src_type, int _dst_type, bool _normalized, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1))
-        init(self, int _max_width, int _src_type, int _dst_type, bool _normalized, 
-            CvSize _ksize)
-        """
-        return _cv.CvBoxFilter_init(*args)
-
-    __swig_destroy__ = _cv.delete_CvBoxFilter
+    __swig_destroy__ = _cv.delete_CvStereoGCState
     __del__ = lambda self : None;
-    def is_normalized(*args):
-        """is_normalized(self) -> bool"""
-        return _cv.CvBoxFilter_is_normalized(*args)
+CvStereoGCState_swigregister = _cv.CvStereoGCState_swigregister
+CvStereoGCState_swigregister(CvStereoGCState)
 
-    def get_scale(*args):
-        """get_scale(self) -> double"""
-        return _cv.CvBoxFilter_get_scale(*args)
 
-    def get_sum_buf(*args):
-        """get_sum_buf(self) -> uchar"""
-        return _cv.CvBoxFilter_get_sum_buf(*args)
+def cvCreateStereoGCState(*args):
+  """cvCreateStereoGCState(int numberOfDisparities, int maxIters) -> CvStereoGCState"""
+  return _cv.cvCreateStereoGCState(*args)
 
-    def get_sum_count_ptr(*args):
-        """get_sum_count_ptr(self) -> int"""
-        return _cv.CvBoxFilter_get_sum_count_ptr(*args)
+def cvReleaseStereoGCState(*args):
+  """cvReleaseStereoGCState(CvStereoGCState state)"""
+  return _cv.cvReleaseStereoGCState(*args)
 
-CvBoxFilter_swigregister = _cv.CvBoxFilter_swigregister
-CvBoxFilter_swigregister(CvBoxFilter)
+def cvFindStereoCorrespondenceGC(*args):
+  """
+    cvFindStereoCorrespondenceGC(CvArr left, CvArr right, CvArr disparityLeft, CvArr disparityRight, 
+        CvStereoGCState state, int useDisparityGuess = 0)
+    """
+  return _cv.cvFindStereoCorrespondenceGC(*args)
 
-class CvLaplaceFilter(CvSepFilter):
-    """Proxy of C++ CvLaplaceFilter class"""
+def cvReprojectImageTo3D(*args):
+  """cvReprojectImageTo3D(CvArr disparityImage, CvArr _3dImage, CvMat Q, int handleMissingValues = 0)"""
+  return _cv.cvReprojectImageTo3D(*args)
+class CvLSH(_object):
+    """Proxy of C++ CvLSH class"""
     __swig_setmethods__ = {}
-    for _s in [CvSepFilter]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CvLaplaceFilter, name, value)
+    __setattr__ = lambda self, name, value: _swig_setattr(self, CvLSH, name, value)
     __swig_getmethods__ = {}
-    for _s in [CvSepFilter]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, CvLaplaceFilter, name)
+    __getattr__ = lambda self, name: _swig_getattr(self, CvLSH, name)
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
-    def __init__(self, *args): 
-        """
-        __init__(self) -> CvLaplaceFilter
-        __init__(self, int _max_width, int _src_type, int _dst_type, bool _normalized, 
-            int _ksize, int _border_mode=1, 
-            CvScalar _border_value=cvScalarAll(0)) -> CvLaplaceFilter
-        __init__(self, int _max_width, int _src_type, int _dst_type, bool _normalized, 
-            int _ksize, int _border_mode=1) -> CvLaplaceFilter
-        __init__(self, int _max_width, int _src_type, int _dst_type, bool _normalized, 
-            int _ksize) -> CvLaplaceFilter
-        """
-        this = _cv.new_CvLaplaceFilter(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _cv.delete_CvLaplaceFilter
+    __swig_destroy__ = _cv.delete_CvLSH
     __del__ = lambda self : None;
-    def init(*args):
-        """
-        init(self, int _max_width, int _src_type, int _dst_type, bool _normalized, 
-            int _ksize, int _border_mode=1, 
-            CvScalar _border_value=cvScalarAll(0))
-        init(self, int _max_width, int _src_type, int _dst_type, bool _normalized, 
-            int _ksize, int _border_mode=1)
-        init(self, int _max_width, int _src_type, int _dst_type, bool _normalized, 
-            int _ksize)
-        init(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1, CvScalar _border_value=cvScalarAll(0))
-        init(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1)
-        init(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1))
-        init(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize)
-        init(self, int _max_width, int _src_type, int _dst_type, CvMat _kx, 
-            CvMat _ky, CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1, CvScalar _border_value=cvScalarAll(0))
-        init(self, int _max_width, int _src_type, int _dst_type, CvMat _kx, 
-            CvMat _ky, CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1)
-        init(self, int _max_width, int _src_type, int _dst_type, CvMat _kx, 
-            CvMat _ky, CvPoint _anchor=cvPoint(-1,-1))
-        init(self, int _max_width, int _src_type, int _dst_type, CvMat _kx, 
-            CvMat _ky)
-        """
-        return _cv.CvLaplaceFilter_init(*args)
-
-    def is_normalized(*args):
-        """is_normalized(self) -> bool"""
-        return _cv.CvLaplaceFilter_is_normalized(*args)
-
-    def is_basic_laplacian(*args):
-        """is_basic_laplacian(self) -> bool"""
-        return _cv.CvLaplaceFilter_is_basic_laplacian(*args)
-
-CvLaplaceFilter_swigregister = _cv.CvLaplaceFilter_swigregister
-CvLaplaceFilter_swigregister(CvLaplaceFilter)
-
-class CvMorphology(CvBaseImageFilter):
-    """Proxy of C++ CvMorphology class"""
-    __swig_setmethods__ = {}
-    for _s in [CvBaseImageFilter]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CvMorphology, name, value)
-    __swig_getmethods__ = {}
-    for _s in [CvBaseImageFilter]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, CvMorphology, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        """
-        __init__(self) -> CvMorphology
-        __init__(self, int _operation, int _max_width, int _src_dst_type, 
-            int _element_shape, CvMat _element, CvSize _ksize=cvSize(0,0), 
-            CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1, CvScalar _border_value=cvScalarAll(0)) -> CvMorphology
-        __init__(self, int _operation, int _max_width, int _src_dst_type, 
-            int _element_shape, CvMat _element, CvSize _ksize=cvSize(0,0), 
-            CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1) -> CvMorphology
-        __init__(self, int _operation, int _max_width, int _src_dst_type, 
-            int _element_shape, CvMat _element, CvSize _ksize=cvSize(0,0), 
-            CvPoint _anchor=cvPoint(-1,-1)) -> CvMorphology
-        __init__(self, int _operation, int _max_width, int _src_dst_type, 
-            int _element_shape, CvMat _element, CvSize _ksize=cvSize(0,0)) -> CvMorphology
-        __init__(self, int _operation, int _max_width, int _src_dst_type, 
-            int _element_shape, CvMat _element) -> CvMorphology
-        """
-        this = _cv.new_CvMorphology(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _cv.delete_CvMorphology
-    __del__ = lambda self : None;
-    def init(*args):
-        """
-        init(self, int _operation, int _max_width, int _src_dst_type, 
-            int _element_shape, CvMat _element, CvSize _ksize=cvSize(0,0), 
-            CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1, CvScalar _border_value=cvScalarAll(0))
-        init(self, int _operation, int _max_width, int _src_dst_type, 
-            int _element_shape, CvMat _element, CvSize _ksize=cvSize(0,0), 
-            CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1)
-        init(self, int _operation, int _max_width, int _src_dst_type, 
-            int _element_shape, CvMat _element, CvSize _ksize=cvSize(0,0), 
-            CvPoint _anchor=cvPoint(-1,-1))
-        init(self, int _operation, int _max_width, int _src_dst_type, 
-            int _element_shape, CvMat _element, CvSize _ksize=cvSize(0,0))
-        init(self, int _operation, int _max_width, int _src_dst_type, 
-            int _element_shape, CvMat _element)
-        init(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1, CvScalar _border_value=cvScalarAll(0))
-        init(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1), 
-            int _border_mode=1)
-        init(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize, CvPoint _anchor=cvPoint(-1,-1))
-        init(self, int _max_width, int _src_type, int _dst_type, bool _is_separable, 
-            CvSize _ksize)
-        """
-        return _cv.CvMorphology_init(*args)
-
-    def clear(*args):
-        """clear(self)"""
-        return _cv.CvMorphology_clear(*args)
-
-    def get_element(*args):
-        """get_element(self) -> CvMat"""
-        return _cv.CvMorphology_get_element(*args)
-
-    def get_element_shape(*args):
-        """get_element_shape(self) -> int"""
-        return _cv.CvMorphology_get_element_shape(*args)
-
-    def get_operation(*args):
-        """get_operation(self) -> int"""
-        return _cv.CvMorphology_get_operation(*args)
-
-    def get_element_sparse_buf(*args):
-        """get_element_sparse_buf(self) -> uchar"""
-        return _cv.CvMorphology_get_element_sparse_buf(*args)
-
-    def get_element_sparse_count(*args):
-        """get_element_sparse_count(self) -> int"""
-        return _cv.CvMorphology_get_element_sparse_count(*args)
-
-    RECT = _cv.CvMorphology_RECT
-    CROSS = _cv.CvMorphology_CROSS
-    ELLIPSE = _cv.CvMorphology_ELLIPSE
-    CUSTOM = _cv.CvMorphology_CUSTOM
-    BINARY = _cv.CvMorphology_BINARY
-    GRAYSCALE = _cv.CvMorphology_GRAYSCALE
-    ERODE = _cv.CvMorphology_ERODE
-    DILATE = _cv.CvMorphology_DILATE
-    def init_binary_element(*args):
-        """
-        init_binary_element(CvMat _element, int _element_shape, CvPoint _anchor=cvPoint(-1,-1))
-        init_binary_element(CvMat _element, int _element_shape)
-        """
-        return _cv.CvMorphology_init_binary_element(*args)
-
-    if _newclass:init_binary_element = staticmethod(init_binary_element)
-    __swig_getmethods__["init_binary_element"] = lambda x: init_binary_element
-CvMorphology_swigregister = _cv.CvMorphology_swigregister
-CvMorphology_swigregister(CvMorphology)
-
-def CvMorphology_init_binary_element(*args):
-  """
-    init_binary_element(CvMat _element, int _element_shape, CvPoint _anchor=cvPoint(-1,-1))
-    CvMorphology_init_binary_element(CvMat _element, int _element_shape)
-    """
-  return _cv.CvMorphology_init_binary_element(*args)
+CvLSH_swigregister = _cv.CvLSH_swigregister
+CvLSH_swigregister(CvLSH)
 
 class CvTuple_CvPoint_2(_object):
-    """Proxy of C++ CvTuple_CvPoint_2 class"""
+    """Proxy of C++ CvTuple<(CvPoint,2)> class"""
     __swig_setmethods__ = {}
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvTuple_CvPoint_2, name, value)
     __swig_getmethods__ = {}
@@ -7974,17 +8051,17 @@ class CvTuple_CvPoint_2(_object):
     __swig_setmethods__["val"] = _cv.CvTuple_CvPoint_2_val_set
     __swig_getmethods__["val"] = _cv.CvTuple_CvPoint_2_val_get
     if _newclass:val = _swig_property(_cv.CvTuple_CvPoint_2_val_get, _cv.CvTuple_CvPoint_2_val_set)
-    def __setitem__(*args):
+    def __setitem__(self, *args):
         """__setitem__(self, int i, CvPoint obj)"""
-        return _cv.CvTuple_CvPoint_2___setitem__(*args)
+        return _cv.CvTuple_CvPoint_2___setitem__(self, *args)
 
-    def __getitem__(*args):
+    def __getitem__(self, *args):
         """__getitem__(self, int i) -> CvPoint"""
-        return _cv.CvTuple_CvPoint_2___getitem__(*args)
+        return _cv.CvTuple_CvPoint_2___getitem__(self, *args)
 
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvTuple_CvPoint_2"""
-        this = _cv.new_CvTuple_CvPoint_2(*args)
+        this = _cv.new_CvTuple_CvPoint_2()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvTuple_CvPoint_2
@@ -7993,7 +8070,7 @@ CvTuple_CvPoint_2_swigregister = _cv.CvTuple_CvPoint_2_swigregister
 CvTuple_CvPoint_2_swigregister(CvTuple_CvPoint_2)
 
 class CvTuple_float_2(_object):
-    """Proxy of C++ CvTuple_float_2 class"""
+    """Proxy of C++ CvTuple<(float,2)> class"""
     __swig_setmethods__ = {}
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvTuple_float_2, name, value)
     __swig_getmethods__ = {}
@@ -8002,17 +8079,17 @@ class CvTuple_float_2(_object):
     __swig_setmethods__["val"] = _cv.CvTuple_float_2_val_set
     __swig_getmethods__["val"] = _cv.CvTuple_float_2_val_get
     if _newclass:val = _swig_property(_cv.CvTuple_float_2_val_get, _cv.CvTuple_float_2_val_set)
-    def __setitem__(*args):
+    def __setitem__(self, *args):
         """__setitem__(self, int i, float obj)"""
-        return _cv.CvTuple_float_2___setitem__(*args)
+        return _cv.CvTuple_float_2___setitem__(self, *args)
 
-    def __getitem__(*args):
+    def __getitem__(self, *args):
         """__getitem__(self, int i) -> float"""
-        return _cv.CvTuple_float_2___getitem__(*args)
+        return _cv.CvTuple_float_2___getitem__(self, *args)
 
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvTuple_float_2"""
-        this = _cv.new_CvTuple_float_2(*args)
+        this = _cv.new_CvTuple_float_2()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvTuple_float_2
@@ -8021,7 +8098,7 @@ CvTuple_float_2_swigregister = _cv.CvTuple_float_2_swigregister
 CvTuple_float_2_swigregister(CvTuple_float_2)
 
 class CvTuple_float_3(_object):
-    """Proxy of C++ CvTuple_float_3 class"""
+    """Proxy of C++ CvTuple<(float,3)> class"""
     __swig_setmethods__ = {}
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvTuple_float_3, name, value)
     __swig_getmethods__ = {}
@@ -8030,17 +8107,17 @@ class CvTuple_float_3(_object):
     __swig_setmethods__["val"] = _cv.CvTuple_float_3_val_set
     __swig_getmethods__["val"] = _cv.CvTuple_float_3_val_get
     if _newclass:val = _swig_property(_cv.CvTuple_float_3_val_get, _cv.CvTuple_float_3_val_set)
-    def __setitem__(*args):
+    def __setitem__(self, *args):
         """__setitem__(self, int i, float obj)"""
-        return _cv.CvTuple_float_3___setitem__(*args)
+        return _cv.CvTuple_float_3___setitem__(self, *args)
 
-    def __getitem__(*args):
+    def __getitem__(self, *args):
         """__getitem__(self, int i) -> float"""
-        return _cv.CvTuple_float_3___getitem__(*args)
+        return _cv.CvTuple_float_3___getitem__(self, *args)
 
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvTuple_float_3"""
-        this = _cv.new_CvTuple_float_3(*args)
+        this = _cv.new_CvTuple_float_3()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvTuple_float_3
@@ -8049,7 +8126,7 @@ CvTuple_float_3_swigregister = _cv.CvTuple_float_3_swigregister
 CvTuple_float_3_swigregister(CvTuple_float_3)
 
 class CvSeq_CvPoint(CvSeq):
-    """Proxy of C++ CvSeq_CvPoint class"""
+    """Proxy of C++ CvTypedSeq<(CvPoint)> class"""
     __swig_setmethods__ = {}
     for _s in [CvSeq]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvSeq_CvPoint, name, value)
@@ -8063,25 +8140,25 @@ class CvSeq_CvPoint(CvSeq):
 
     if _newclass:cast = staticmethod(cast)
     __swig_getmethods__["cast"] = lambda x: cast
-    def __getitem__(*args):
+    def __getitem__(self, *args):
         """__getitem__(self, int i) -> CvPoint"""
-        return _cv.CvSeq_CvPoint___getitem__(*args)
+        return _cv.CvSeq_CvPoint___getitem__(self, *args)
 
-    def __setitem__(*args):
+    def __setitem__(self, *args):
         """__setitem__(self, int i, CvPoint obj)"""
-        return _cv.CvSeq_CvPoint___setitem__(*args)
+        return _cv.CvSeq_CvPoint___setitem__(self, *args)
 
-    def append(*args):
+    def append(self, *args):
         """append(self, CvPoint obj)"""
-        return _cv.CvSeq_CvPoint_append(*args)
+        return _cv.CvSeq_CvPoint_append(self, *args)
 
-    def pop(*args):
+    def pop(self):
         """pop(self) -> CvPoint"""
-        return _cv.CvSeq_CvPoint_pop(*args)
+        return _cv.CvSeq_CvPoint_pop(self)
 
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSeq_CvPoint"""
-        this = _cv.new_CvSeq_CvPoint(*args)
+        this = _cv.new_CvSeq_CvPoint()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSeq_CvPoint
@@ -8094,7 +8171,7 @@ def CvSeq_CvPoint_cast(*args):
   return _cv.CvSeq_CvPoint_cast(*args)
 
 class CvSeq_CvPoint2D32f(CvSeq):
-    """Proxy of C++ CvSeq_CvPoint2D32f class"""
+    """Proxy of C++ CvTypedSeq<(CvPoint2D32f)> class"""
     __swig_setmethods__ = {}
     for _s in [CvSeq]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvSeq_CvPoint2D32f, name, value)
@@ -8108,25 +8185,25 @@ class CvSeq_CvPoint2D32f(CvSeq):
 
     if _newclass:cast = staticmethod(cast)
     __swig_getmethods__["cast"] = lambda x: cast
-    def __getitem__(*args):
+    def __getitem__(self, *args):
         """__getitem__(self, int i) -> CvPoint2D32f"""
-        return _cv.CvSeq_CvPoint2D32f___getitem__(*args)
+        return _cv.CvSeq_CvPoint2D32f___getitem__(self, *args)
 
-    def __setitem__(*args):
+    def __setitem__(self, *args):
         """__setitem__(self, int i, CvPoint2D32f obj)"""
-        return _cv.CvSeq_CvPoint2D32f___setitem__(*args)
+        return _cv.CvSeq_CvPoint2D32f___setitem__(self, *args)
 
-    def append(*args):
+    def append(self, *args):
         """append(self, CvPoint2D32f obj)"""
-        return _cv.CvSeq_CvPoint2D32f_append(*args)
+        return _cv.CvSeq_CvPoint2D32f_append(self, *args)
 
-    def pop(*args):
+    def pop(self):
         """pop(self) -> CvPoint2D32f"""
-        return _cv.CvSeq_CvPoint2D32f_pop(*args)
+        return _cv.CvSeq_CvPoint2D32f_pop(self)
 
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSeq_CvPoint2D32f"""
-        this = _cv.new_CvSeq_CvPoint2D32f(*args)
+        this = _cv.new_CvSeq_CvPoint2D32f()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSeq_CvPoint2D32f
@@ -8139,7 +8216,7 @@ def CvSeq_CvPoint2D32f_cast(*args):
   return _cv.CvSeq_CvPoint2D32f_cast(*args)
 
 class CvSeq_CvRect(CvSeq):
-    """Proxy of C++ CvSeq_CvRect class"""
+    """Proxy of C++ CvTypedSeq<(CvRect)> class"""
     __swig_setmethods__ = {}
     for _s in [CvSeq]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvSeq_CvRect, name, value)
@@ -8153,25 +8230,25 @@ class CvSeq_CvRect(CvSeq):
 
     if _newclass:cast = staticmethod(cast)
     __swig_getmethods__["cast"] = lambda x: cast
-    def __getitem__(*args):
+    def __getitem__(self, *args):
         """__getitem__(self, int i) -> CvRect"""
-        return _cv.CvSeq_CvRect___getitem__(*args)
+        return _cv.CvSeq_CvRect___getitem__(self, *args)
 
-    def __setitem__(*args):
+    def __setitem__(self, *args):
         """__setitem__(self, int i, CvRect obj)"""
-        return _cv.CvSeq_CvRect___setitem__(*args)
+        return _cv.CvSeq_CvRect___setitem__(self, *args)
 
-    def append(*args):
+    def append(self, *args):
         """append(self, CvRect obj)"""
-        return _cv.CvSeq_CvRect_append(*args)
+        return _cv.CvSeq_CvRect_append(self, *args)
 
-    def pop(*args):
+    def pop(self):
         """pop(self) -> CvRect"""
-        return _cv.CvSeq_CvRect_pop(*args)
+        return _cv.CvSeq_CvRect_pop(self)
 
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSeq_CvRect"""
-        this = _cv.new_CvSeq_CvRect(*args)
+        this = _cv.new_CvSeq_CvRect()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSeq_CvRect
@@ -8184,7 +8261,7 @@ def CvSeq_CvRect_cast(*args):
   return _cv.CvSeq_CvRect_cast(*args)
 
 class CvSeq_CvSeq(CvSeq):
-    """Proxy of C++ CvSeq_CvSeq class"""
+    """Proxy of C++ CvTypedSeq<(p.CvSeq)> class"""
     __swig_setmethods__ = {}
     for _s in [CvSeq]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvSeq_CvSeq, name, value)
@@ -8198,25 +8275,25 @@ class CvSeq_CvSeq(CvSeq):
 
     if _newclass:cast = staticmethod(cast)
     __swig_getmethods__["cast"] = lambda x: cast
-    def __getitem__(*args):
+    def __getitem__(self, *args):
         """__getitem__(self, int i) -> CvSeq"""
-        return _cv.CvSeq_CvSeq___getitem__(*args)
+        return _cv.CvSeq_CvSeq___getitem__(self, *args)
 
-    def __setitem__(*args):
+    def __setitem__(self, *args):
         """__setitem__(self, int i, CvSeq obj)"""
-        return _cv.CvSeq_CvSeq___setitem__(*args)
+        return _cv.CvSeq_CvSeq___setitem__(self, *args)
 
-    def append(*args):
+    def append(self, *args):
         """append(self, CvSeq obj)"""
-        return _cv.CvSeq_CvSeq_append(*args)
+        return _cv.CvSeq_CvSeq_append(self, *args)
 
-    def pop(*args):
+    def pop(self):
         """pop(self) -> CvSeq"""
-        return _cv.CvSeq_CvSeq_pop(*args)
+        return _cv.CvSeq_CvSeq_pop(self)
 
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSeq_CvSeq"""
-        this = _cv.new_CvSeq_CvSeq(*args)
+        this = _cv.new_CvSeq_CvSeq()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSeq_CvSeq
@@ -8229,7 +8306,7 @@ def CvSeq_CvSeq_cast(*args):
   return _cv.CvSeq_CvSeq_cast(*args)
 
 class CvSeq_CvQuadEdge2D(CvSeq):
-    """Proxy of C++ CvSeq_CvQuadEdge2D class"""
+    """Proxy of C++ CvTypedSeq<(CvQuadEdge2D)> class"""
     __swig_setmethods__ = {}
     for _s in [CvSeq]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvSeq_CvQuadEdge2D, name, value)
@@ -8243,25 +8320,25 @@ class CvSeq_CvQuadEdge2D(CvSeq):
 
     if _newclass:cast = staticmethod(cast)
     __swig_getmethods__["cast"] = lambda x: cast
-    def __getitem__(*args):
+    def __getitem__(self, *args):
         """__getitem__(self, int i) -> CvQuadEdge2D"""
-        return _cv.CvSeq_CvQuadEdge2D___getitem__(*args)
+        return _cv.CvSeq_CvQuadEdge2D___getitem__(self, *args)
 
-    def __setitem__(*args):
+    def __setitem__(self, *args):
         """__setitem__(self, int i, CvQuadEdge2D obj)"""
-        return _cv.CvSeq_CvQuadEdge2D___setitem__(*args)
+        return _cv.CvSeq_CvQuadEdge2D___setitem__(self, *args)
 
-    def append(*args):
+    def append(self, *args):
         """append(self, CvQuadEdge2D obj)"""
-        return _cv.CvSeq_CvQuadEdge2D_append(*args)
+        return _cv.CvSeq_CvQuadEdge2D_append(self, *args)
 
-    def pop(*args):
+    def pop(self):
         """pop(self) -> CvQuadEdge2D"""
-        return _cv.CvSeq_CvQuadEdge2D_pop(*args)
+        return _cv.CvSeq_CvQuadEdge2D_pop(self)
 
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSeq_CvQuadEdge2D"""
-        this = _cv.new_CvSeq_CvQuadEdge2D(*args)
+        this = _cv.new_CvSeq_CvQuadEdge2D()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSeq_CvQuadEdge2D
@@ -8274,7 +8351,7 @@ def CvSeq_CvQuadEdge2D_cast(*args):
   return _cv.CvSeq_CvQuadEdge2D_cast(*args)
 
 class CvSeq_CvConnectedComp(CvSeq):
-    """Proxy of C++ CvSeq_CvConnectedComp class"""
+    """Proxy of C++ CvTypedSeq<(CvConnectedComp)> class"""
     __swig_setmethods__ = {}
     for _s in [CvSeq]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvSeq_CvConnectedComp, name, value)
@@ -8288,25 +8365,25 @@ class CvSeq_CvConnectedComp(CvSeq):
 
     if _newclass:cast = staticmethod(cast)
     __swig_getmethods__["cast"] = lambda x: cast
-    def __getitem__(*args):
+    def __getitem__(self, *args):
         """__getitem__(self, int i) -> CvConnectedComp"""
-        return _cv.CvSeq_CvConnectedComp___getitem__(*args)
+        return _cv.CvSeq_CvConnectedComp___getitem__(self, *args)
 
-    def __setitem__(*args):
+    def __setitem__(self, *args):
         """__setitem__(self, int i, CvConnectedComp obj)"""
-        return _cv.CvSeq_CvConnectedComp___setitem__(*args)
+        return _cv.CvSeq_CvConnectedComp___setitem__(self, *args)
 
-    def append(*args):
+    def append(self, *args):
         """append(self, CvConnectedComp obj)"""
-        return _cv.CvSeq_CvConnectedComp_append(*args)
+        return _cv.CvSeq_CvConnectedComp_append(self, *args)
 
-    def pop(*args):
+    def pop(self):
         """pop(self) -> CvConnectedComp"""
-        return _cv.CvSeq_CvConnectedComp_pop(*args)
+        return _cv.CvSeq_CvConnectedComp_pop(self)
 
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSeq_CvConnectedComp"""
-        this = _cv.new_CvSeq_CvConnectedComp(*args)
+        this = _cv.new_CvSeq_CvConnectedComp()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSeq_CvConnectedComp
@@ -8319,7 +8396,7 @@ def CvSeq_CvConnectedComp_cast(*args):
   return _cv.CvSeq_CvConnectedComp_cast(*args)
 
 class CvSeq_CvPoint_2(CvSeq):
-    """Proxy of C++ CvSeq_CvPoint_2 class"""
+    """Proxy of C++ CvTypedSeq<(CvTuple<(CvPoint,2)>)> class"""
     __swig_setmethods__ = {}
     for _s in [CvSeq]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvSeq_CvPoint_2, name, value)
@@ -8333,25 +8410,25 @@ class CvSeq_CvPoint_2(CvSeq):
 
     if _newclass:cast = staticmethod(cast)
     __swig_getmethods__["cast"] = lambda x: cast
-    def __getitem__(*args):
+    def __getitem__(self, *args):
         """__getitem__(self, int i) -> CvTuple_CvPoint_2"""
-        return _cv.CvSeq_CvPoint_2___getitem__(*args)
+        return _cv.CvSeq_CvPoint_2___getitem__(self, *args)
 
-    def __setitem__(*args):
+    def __setitem__(self, *args):
         """__setitem__(self, int i, CvTuple_CvPoint_2 obj)"""
-        return _cv.CvSeq_CvPoint_2___setitem__(*args)
+        return _cv.CvSeq_CvPoint_2___setitem__(self, *args)
 
-    def append(*args):
+    def append(self, *args):
         """append(self, CvTuple_CvPoint_2 obj)"""
-        return _cv.CvSeq_CvPoint_2_append(*args)
+        return _cv.CvSeq_CvPoint_2_append(self, *args)
 
-    def pop(*args):
+    def pop(self):
         """pop(self) -> CvTuple_CvPoint_2"""
-        return _cv.CvSeq_CvPoint_2_pop(*args)
+        return _cv.CvSeq_CvPoint_2_pop(self)
 
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSeq_CvPoint_2"""
-        this = _cv.new_CvSeq_CvPoint_2(*args)
+        this = _cv.new_CvSeq_CvPoint_2()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSeq_CvPoint_2
@@ -8364,7 +8441,7 @@ def CvSeq_CvPoint_2_cast(*args):
   return _cv.CvSeq_CvPoint_2_cast(*args)
 
 class CvSeq_float_2(CvSeq):
-    """Proxy of C++ CvSeq_float_2 class"""
+    """Proxy of C++ CvTypedSeq<(CvTuple<(float,2)>)> class"""
     __swig_setmethods__ = {}
     for _s in [CvSeq]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvSeq_float_2, name, value)
@@ -8378,25 +8455,25 @@ class CvSeq_float_2(CvSeq):
 
     if _newclass:cast = staticmethod(cast)
     __swig_getmethods__["cast"] = lambda x: cast
-    def __getitem__(*args):
+    def __getitem__(self, *args):
         """__getitem__(self, int i) -> CvTuple_float_2"""
-        return _cv.CvSeq_float_2___getitem__(*args)
+        return _cv.CvSeq_float_2___getitem__(self, *args)
 
-    def __setitem__(*args):
+    def __setitem__(self, *args):
         """__setitem__(self, int i, CvTuple_float_2 obj)"""
-        return _cv.CvSeq_float_2___setitem__(*args)
+        return _cv.CvSeq_float_2___setitem__(self, *args)
 
-    def append(*args):
+    def append(self, *args):
         """append(self, CvTuple_float_2 obj)"""
-        return _cv.CvSeq_float_2_append(*args)
+        return _cv.CvSeq_float_2_append(self, *args)
 
-    def pop(*args):
+    def pop(self):
         """pop(self) -> CvTuple_float_2"""
-        return _cv.CvSeq_float_2_pop(*args)
+        return _cv.CvSeq_float_2_pop(self)
 
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSeq_float_2"""
-        this = _cv.new_CvSeq_float_2(*args)
+        this = _cv.new_CvSeq_float_2()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSeq_float_2
@@ -8409,7 +8486,7 @@ def CvSeq_float_2_cast(*args):
   return _cv.CvSeq_float_2_cast(*args)
 
 class CvSeq_float_3(CvSeq):
-    """Proxy of C++ CvSeq_float_3 class"""
+    """Proxy of C++ CvTypedSeq<(CvTuple<(float,3)>)> class"""
     __swig_setmethods__ = {}
     for _s in [CvSeq]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvSeq_float_3, name, value)
@@ -8423,25 +8500,25 @@ class CvSeq_float_3(CvSeq):
 
     if _newclass:cast = staticmethod(cast)
     __swig_getmethods__["cast"] = lambda x: cast
-    def __getitem__(*args):
+    def __getitem__(self, *args):
         """__getitem__(self, int i) -> CvTuple_float_3"""
-        return _cv.CvSeq_float_3___getitem__(*args)
+        return _cv.CvSeq_float_3___getitem__(self, *args)
 
-    def __setitem__(*args):
+    def __setitem__(self, *args):
         """__setitem__(self, int i, CvTuple_float_3 obj)"""
-        return _cv.CvSeq_float_3___setitem__(*args)
+        return _cv.CvSeq_float_3___setitem__(self, *args)
 
-    def append(*args):
+    def append(self, *args):
         """append(self, CvTuple_float_3 obj)"""
-        return _cv.CvSeq_float_3_append(*args)
+        return _cv.CvSeq_float_3_append(self, *args)
 
-    def pop(*args):
+    def pop(self):
         """pop(self) -> CvTuple_float_3"""
-        return _cv.CvSeq_float_3_pop(*args)
+        return _cv.CvSeq_float_3_pop(self)
 
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSeq_float_3"""
-        this = _cv.new_CvSeq_float_3(*args)
+        this = _cv.new_CvSeq_float_3()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSeq_float_3
@@ -8457,21 +8534,21 @@ def CvSeq_float_3_cast(*args):
 def SendErrorToPython(*args):
   """
     SendErrorToPython(int status, char func_name, char err_msg, char file_name, 
-        int line, void ?) -> int
+        int line, void arg5) -> int
     """
   return _cv.SendErrorToPython(*args)
 
-def function_ptr_generator(*args):
+def function_ptr_generator():
   """function_ptr_generator() -> CvErrorCallback"""
-  return _cv.function_ptr_generator(*args)
+  return _cv.function_ptr_generator()
 
-def void_ptr_generator(*args):
+def void_ptr_generator():
   """void_ptr_generator() -> void"""
-  return _cv.void_ptr_generator(*args)
+  return _cv.void_ptr_generator()
 
-def void_ptrptr_generator(*args):
+def void_ptrptr_generator():
   """void_ptrptr_generator() -> void"""
-  return _cv.void_ptrptr_generator(*args)
+  return _cv.void_ptrptr_generator()
 IPL_ALIGN_DWORD=IPL_ALIGN_4BYTES
 IPL_ALIGN_QWORD=IPL_ALIGN_8BYTES
 CV_MAKE_TYPE=CV_MAKETYPE
@@ -8520,6 +8597,18 @@ CV_BayerBG2RGB=CV_BayerRG2BGR
 CV_BayerGB2RGB=CV_BayerGR2BGR
 CV_BayerRG2RGB=CV_BayerBG2BGR
 CV_BayerGR2RGB=CV_BayerGB2BGR
+CV_FM_LMEDS_ONLY=CV_LMEDS
+CV_FM_RANSAC_ONLY=CV_RANSAC
+CV_FM_LMEDS=CV_LMEDS
+CV_FM_RANSAC=CV_RANSAC
+
+cvCalcBackProject = cvCalcArrBackProject;
+
+cvCalcBackProjectPatch = cvCalcArrBackProjectPatch;
+
+cvCalcImageHist = cvCalcArrHist;
+
+cvCalcHist = cvCalcArrHist;
 
 __doc__ = """
 OpenCV is the Intel Open CV library, an open source effort to provide